From f6f669617fffd75b96de6977c3b75b5eff2985c1 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 26 Nov 2023 16:20:52 +0000 Subject: [PATCH] Fix `-normaliseconf` when using `PrivateKeyPath` --- cmd/yggdrasil/main.go | 3 +++ src/config/config.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index a225755c..b133ed36 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -162,6 +162,9 @@ func main() { case *normaliseconf: cfg.AdminListen = "" + if cfg.PrivateKeyPath != "" { + cfg.PrivateKey = nil + } var bs []byte if *confjson { bs, err = json.MarshalIndent(cfg, "", " ") diff --git a/src/config/config.go b/src/config/config.go index e899a35d..aac51467 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -40,8 +40,8 @@ import ( // options that are necessary for an Yggdrasil node to run. You will need to // supply one of these structs to the Yggdrasil core when starting a node. type NodeConfig struct { - PrivateKey KeyBytes `comment:"Your private key. DO NOT share this with anyone!"` - PrivateKeyPath string `json:",omitempty"` + PrivateKey KeyBytes `json:",omitempty" comment:"Your private key. DO NOT share this with anyone!"` + PrivateKeyPath string `json:",omitempty" comment:"The path to your private key file in PEM format."` Certificate *tls.Certificate `json:"-"` Peers []string `comment:"List of connection strings for outbound peer connections in URI format,\ne.g. tls://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j. These connections\nwill obey the operating system routing table, therefore you should\nuse this section when you may connect via different interfaces."` InterfacePeers map[string][]string `comment:"List of connection strings for outbound peer connections in URI format,\narranged by source interface, e.g. { \"eth0\": [ \"tls://a.b.c.d:e\" ] }.\nNote that SOCKS peerings will NOT be affected by this option and should\ngo in the \"Peers\" section instead."`