From 0a09e6d1fc65f0a3a1f6c62ba75a91e7b005b5ee Mon Sep 17 00:00:00 2001 From: Owen Schwartz Date: Thu, 26 Dec 2024 21:31:48 -0500 Subject: [PATCH] Add env vars? --- Makefile | 2 +- main.go | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5b3514c..d48531c 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ push: docker push fossorial/newt:latest test: - docker run -it -p 3002:3002 -v ./config_example.json:/config/config.json --cap-add=NET_ADMIN --cap-add=SYS_MODULE newt --config /config/config.json + docker run fossorial/newt:latest local: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o newt diff --git a/main.go b/main.go index e514afc..3276332 100644 --- a/main.go +++ b/main.go @@ -248,16 +248,15 @@ func main() { flag.StringVar(&logLevel, "log-level", getEnvWithDefault("LOG_LEVEL", "INFO"), "Log level (DEBUG, INFO, WARN, ERROR, FATAL)") flag.Parse() - // Validate required fields - if endpoint == "" || id == "" || secret == "" { - logger.Fatal("endpoint, id, and secret are required either via CLI flags or environment variables") - - } - logger.Init() loggerLevel := parseLogLevel(logLevel) logger.GetLogger().SetLevel(parseLogLevel(logLevel)) + // Validate required fields + if endpoint == "" || id == "" || secret == "" { + logger.Fatal("endpoint, id, and secret are required either via CLI flags or environment variables") + } + privateKey, err = wgtypes.GeneratePrivateKey() if err != nil { logger.Fatal("Failed to generate private key: %v", err)