From 1b42357889c1a510e08f4f1d52582bbc0c7e652b Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 10 Feb 2019 16:07:49 +0000 Subject: [PATCH] Add setNodeInfoName to yggdrasilconf --- contrib/config/yggdrasilconf.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/config/yggdrasilconf.go b/contrib/config/yggdrasilconf.go index ad55e163..18c0022a 100644 --- a/contrib/config/yggdrasilconf.go +++ b/contrib/config/yggdrasilconf.go @@ -24,6 +24,7 @@ type nodeConfig = config.NodeConfig func main() { useconffile := flag.String("useconffile", "/etc/yggdrasil.conf", "update config at specified file path") + usejson := flag.Bool("json", false, "write out new config as JSON instead of HJSON") flag.Parse() cfg := nodeConfig{} var config []byte @@ -42,14 +43,14 @@ func main() { } } var dat map[string]interface{} - if err := hjson.Unmarshal(config, &dat); err != nil { + if err = hjson.Unmarshal(config, &dat); err != nil { panic(err) } - confJson, err := json.Marshal(dat) + confJSON, err := json.Marshal(dat) if err != nil { panic(err) } - json.Unmarshal(confJson, &cfg) + json.Unmarshal(confJSON, &cfg) switch flag.Arg(0) { case "setMTU": cfg.IfMTU, err = strconv.Atoi(flag.Arg(1)) @@ -87,8 +88,15 @@ func main() { cfg.Peers = append(cfg.Peers[:k], cfg.Peers[k+1:]...) } } + case "setNodeInfoName": + cfg.NodeInfo["name"] = flag.Arg(1) + } + var bs []byte + if *usejson { + bs, err = json.Marshal(cfg) + } else { + bs, err = hjson.Marshal(cfg) } - bs, err := hjson.Marshal(cfg) if err != nil { panic(err) }