diff options
Diffstat (limited to 'src/Config.hs')
| -rw-r--r-- | src/Config.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Config.hs b/src/Config.hs index 12fc09d..137d42d 100644 --- a/src/Config.hs +++ b/src/Config.hs @@ -43,14 +43,14 @@ getConfig = do Config <$> (read <$> resolveVal (lookup "port" confFile) "PORT" "20546") - <*> resolveVal (lookup "bind-addr" confFile) "BIND_ADDR" "*6" - <*> resolveVal (lookup "base-url" confFile) "BASE_URL" "http://localhost:20546" - <*> resolveVal (lookup "favicon-url" confFile) "FAVICON_URL" "" - <*> resolveVal (lookup "db-path" confFile) "DB_PATH" "banger.db" - <*> resolveVal (lookup "admin-user" confFile) "ADMIN_USER" "bleb" - <*> resolveVal (lookup "admin-pw-hash" confFile) "ADMIN_PW_HASH" "" -- prevent login without manual pw - <*> fmap (<|> lookup "email-command" confFile) (lookupEnv "EMAIL_CMD") - <*> resolveVal (lookup "admin-email" confFile) "ADMIN_EMAIL" "" + <*> resolveVal (lookup "bind-addr" confFile) "BIND_ADDR" "*6" + <*> resolveVal (lookup "base-url" confFile) "BASE_URL" "http://localhost:20546" + <*> resolveVal (lookup "favicon-url" confFile) "FAVICON_URL" "" + <*> resolveVal (lookup "db-path" confFile) "DB_PATH" "banger.db" + <*> resolveVal (lookup "admin-user" confFile) "ADMIN_USER" "bleb" + <*> resolveVal (lookup "admin-pw-hash" confFile) "ADMIN_PW_HASH" "" -- prevent login without manual pw + <*> fmap (<|> lookup "email-command" confFile) (lookupEnv "EMAIL_CMD") + <*> resolveVal (lookup "admin-email" confFile) "ADMIN_EMAIL" "" where resolveVal :: IsString s => Maybe String -> String -> String -> IO s resolveVal mayConf q def = do |