diff options
| author | Paul Buetow <paul@buetow.org> | 2024-06-17 11:01:20 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-06-17 11:01:20 +0300 |
| commit | fd005e1b770b071eaa137877d9fe7a5845670de9 (patch) | |
| tree | ebd68d99e035504520e04cde83f313892f61df51 /internal/config/server | |
| parent | 2f353f6d9aee9d9a989d11757289c11679752789 (diff) | |
add EDITOR client config, plus a bit refactor of the config env handling
Diffstat (limited to 'internal/config/server')
| -rw-r--r-- | internal/config/server/server.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/internal/config/server/server.go b/internal/config/server/server.go index 0870950..6b06ff3 100644 --- a/internal/config/server/server.go +++ b/internal/config/server/server.go @@ -12,7 +12,7 @@ import ( type ServerConfig struct { ListenAddr string `json:"ListenAddr,omitempty"` Partner string `json:"Partner,omitempty"` - ApiKey string `json:"ApiKey,omitempty"` + APIKey string `json:"APIKey,omitempty"` DataDir string `json:"StateDir,omitempty"` EmailTo string `json:"EmailTo,omitempty"` EmailFrom string `json:"EmailFrom,omitempty"` @@ -21,13 +21,13 @@ type ServerConfig struct { func New(configFile string) (ServerConfig, error) { conf, _ := config.FromFile[ServerConfig](configFile) - conf.ListenAddr = config.FromENV("ListenAddr", conf.ListenAddr, "localhost:8080") - conf.Partner = config.FromENV("Partner", conf.Partner) - conf.ApiKey = config.FromENV("ApiKey", conf.ApiKey) - conf.DataDir = config.FromENV("DataDir", conf.DataDir, "data") - conf.EmailTo = config.FromENV("EmailTo", conf.EmailTo) - conf.EmailFrom = config.FromENV("EmailFrom", conf.EmailFrom) - conf.SMTPServer = config.FromENV("SMTPServer", conf.SMTPServer) + conf.ListenAddr = config.FromENV("GOS_LISTEN_ADDR", conf.ListenAddr, "localhost:8080") + conf.Partner = config.FromENV("GOS_PARTNER", conf.Partner) + conf.APIKey = config.FromENV("GOS_API_KEY", conf.APIKey) + conf.DataDir = config.FromENV("GOS_DATA_DIR", conf.DataDir, "data") + conf.EmailTo = config.FromENV("GOS_EMAIL_TO", conf.EmailTo) + conf.EmailFrom = config.FromENV("GOS_EMAIL_FROM", conf.EmailFrom) + conf.SMTPServer = config.FromENV("GOS_SMTP_SERVER", conf.SMTPServer) if conf.SMTPServer == "" { hostname, err := os.Hostname() |