diff options
Diffstat (limited to 'internal/config/server/server.go')
| -rw-r--r-- | internal/config/server/server.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/internal/config/server/server.go b/internal/config/server/server.go index a5bd5fb..42f0870 100644 --- a/internal/config/server/server.go +++ b/internal/config/server/server.go @@ -19,11 +19,18 @@ type ServerConfig struct { SMTPServer string `json:"SMTPServer,omitempty"` MergeIntervalS int `json:"MergeInterval,omitempty"` ScheduleIntervalS int `json:"ScheduleInterval,omitempty"` - Secrets SecretsConfig `json:"Secrets,omitemtpy"` + Secrets SecretsConfig `json:"Secrets,omitempty"` } -func New(configFile string) (ServerConfig, error) { - conf, _ := config.FromFile[ServerConfig](configFile) +func New(configFile, secretsFile string) (ServerConfig, error) { + conf, err := config.FromFile[ServerConfig](configFile) + if err != nil { + return conf, err + } + + if conf.Secrets, err = newSecretsConfig(secretsFile); err != nil { + return conf, err + } conf.ListenAddr = config.EnvToStr("GOS_LISTEN_ADDR", conf.ListenAddr, "localhost:8080") conf.Partner = config.EnvToStr("GOS_PARTNER", "GOS_PARTNERS", conf.Partner) |