diff options
| author | Paul Buetow <paul@buetow.org> | 2024-08-29 10:07:18 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-08-29 10:07:18 +0300 |
| commit | 2b02b828778c2e95a3c4e4fb7b41a8b626d1ba01 (patch) | |
| tree | ed2ca7d37d72ad54a2394fe2aff5e11c385e127b | |
| parent | 6126c5d1c4a96312243ceef9a8bddc007aab3df7 (diff) | |
can read secrets
| -rw-r--r-- | cmd/gos/main.go | 1 | ||||
| -rw-r--r-- | cmd/gosd/main.go | 4 | ||||
| -rw-r--r-- | internal/config/client/client.go | 3 | ||||
| -rw-r--r-- | internal/config/server/server.go | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/cmd/gos/main.go b/cmd/gos/main.go index f757c64..7042755 100644 --- a/cmd/gos/main.go +++ b/cmd/gos/main.go @@ -11,6 +11,7 @@ import ( func main() { configFile := flag.String("cfg", "/etc/gos.json", "The configuration file") + flag.Parse() conf, err := config.New(*configFile) if err != nil { diff --git a/cmd/gosd/main.go b/cmd/gosd/main.go index 6bd2e16..baf62ae 100644 --- a/cmd/gosd/main.go +++ b/cmd/gosd/main.go @@ -16,7 +16,9 @@ import ( func main() { configFile := flag.String("cfg", "/etc/gosd.json", "The configuration file") - secretsFile := flag.String("cfg", "/etc/gosdsecrets.json", "The secrets file") + secretsFile := flag.String("secrets", "/etc/gosdsecrets.json", "The secrets file") + + flag.Parse() conf, err := config.New(*configFile, *secretsFile) if err != nil { diff --git a/internal/config/client/client.go b/internal/config/client/client.go index f39ea24..613ec60 100644 --- a/internal/config/client/client.go +++ b/internal/config/client/client.go @@ -3,6 +3,7 @@ package client import ( "errors" "fmt" + "log" "os" "strings" @@ -21,7 +22,7 @@ type ClientConfig struct { func New(configFile string) (ClientConfig, error) { conf, err := config.FromFile[ClientConfig](configFile) if err != nil { - return conf, err + log.Println("Proceeding with default config, as:", err) } conf.Server = config.EnvToStr("GOS_SERVERS", conf.Server) diff --git a/internal/config/server/server.go b/internal/config/server/server.go index 42f0870..6d65f5f 100644 --- a/internal/config/server/server.go +++ b/internal/config/server/server.go @@ -25,7 +25,7 @@ type ServerConfig struct { func New(configFile, secretsFile string) (ServerConfig, error) { conf, err := config.FromFile[ServerConfig](configFile) if err != nil { - return conf, err + log.Println("proceeding with default config, as:", err) } if conf.Secrets, err = newSecretsConfig(secretsFile); err != nil { |
