From 9d4eddcef8ce64e81be417abc24e4bcf0335a474 Mon Sep 17 00:00:00 2001 From: julianknodt Date: Wed, 14 Jul 2021 15:20:38 -0700 Subject: [PATCH] cmd/derper: add default -c arguments This adds some convenient defaults for -c, so that user-provided DERPs require less command line flags. Signed-off-by: julianknodt --- cmd/derper/derper.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/derper/derper.go b/cmd/derper/derper.go index 3af280610..a83e7a39f 100644 --- a/cmd/derper/derper.go +++ b/cmd/derper/derper.go @@ -58,7 +58,12 @@ func loadConfig() config { return config{PrivateKey: mustNewKey()} } if *configPath == "" { - log.Fatalf("derper: -c not specified") + if os.Getuid() == 0 { + *configPath = "/var/lib/derper/derper.key" + } else { + *configPath = "derper.key" + } + log.Printf("no config path specified; using %s", *configPath) } b, err := ioutil.ReadFile(*configPath) switch {