diff --git a/README.md b/README.md index c9c040d..419bfdc 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,12 @@ The config file is a toml file, even though it as of now makes not really use of any toml features. ```toml -[mail] -domain = "the domain of the smtp server to send messages with" -user = "the username on the smtp server" -password = "the passwond on the smtp server" -to = "the mail to send to" -from = "the sender of the mail" -errorTo = "the address to send a mail to in case of error" +mailDomain = "the domain of the smtp server to send messages with" +mailUser = "the username on the smtp server" +mailPassword = "the passwond on the smtp server" +mailTo = "the mail to send to" +mailFrom = "the sender of the mail" +mailErrorTo = "the address to send a mail to in case of error" ``` ## Develop @@ -34,5 +33,4 @@ this depends on your local cabal cache. - Add the nix modules to the flake - Better Error handling - Find out which exceptions the SMTP module throws -- Split config into secrets and non secret config - - make the pad url configurable + diff --git a/app/Config.hs b/app/Config.hs index 604d5cb..6d87a35 100644 --- a/app/Config.hs +++ b/app/Config.hs @@ -16,13 +16,13 @@ data Config = Config { } deriving Show configCodec :: TomlCodec Config -configCodec = flip Toml.table "mail" $ Config - <$> Toml.string "domain" .= mailDomain - <*> Toml.string "user" .= mailUsername - <*> Toml.string "password" .= mailPassword - <*> Toml.text "to" .= mailTo - <*> Toml.text "from" .= mailFrom - <*> Toml.text "errorTo" .= mailErrorTo +configCodec = Config + <$> Toml.string "mailDomain" .= mailDomain + <*> Toml.string "mailUser" .= mailUsername + <*> Toml.string "mailPassword" .= mailPassword + <*> Toml.text "mailTo" .= mailTo + <*> Toml.text "mailFrom" .= mailFrom + <*> Toml.text "mailErrorTo" .= mailErrorTo parseConfigFile :: (MonadIO m, MonadFail m) => String -> m Config parseConfigFile path = do