From a7c3fe76f23f9bd5ba15adcb8a469faf53ad3769 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gregor.kleen@ifi.lmu.de>
Date: Tue, 7 Jan 2020 16:06:00 +0100
Subject: [PATCH] feat(config): improve configurability of VerpMode

---
 config/settings.yml | 4 ++--
 src/Application.hs  | 2 +-
 src/Settings.hs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index 61e0f0b03..3a3263a01 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -14,8 +14,8 @@ mail-from:
   email:        "_env:MAILFROM_EMAIL:uniworx@localhost"
 mail-object-domain: "_env:MAILOBJECT_DOMAIN:localhost"
 mail-verp:
-  separator:    "+"
-  at-replacement: "="
+  separator:    "_env:VERP_SEPARATOR:+"
+  at-replacement: "_env:VERP_AT_REPLACEMENT:="
 mail-support:
   name:         "_env:MAILSUPPORT_NAME:"
   email:        "_env:MAILSUPPORT:uni2work@ifi.lmu.de"
diff --git a/src/Application.hs b/src/Application.hs
index 2da92e313..7ae3d5397 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -194,7 +194,7 @@ makeFoundation appSettings'@AppSettings{..} = do
 
     runAppLoggingT tempFoundation $ do
       $logInfoS "InstanceID" $ UUID.toText appInstanceID
-      -- logDebugS "Configuration" $ tshow appSettings'
+      $logDebugS "Configuration" $ tshow appSettings'
 
       smtpPool <- for appSmtpConf $ \c -> do
         $logDebugS "setup" "SMTP-Pool"
diff --git a/src/Settings.hs b/src/Settings.hs
index d70830a4f..ca4610ebb 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -393,7 +393,7 @@ instance FromJSON AppSettings where
 
         appMailFrom               <- o .: "mail-from"
         appMailObjectDomain       <- o .: "mail-object-domain"
-        appMailVerp               <- o .: "mail-verp"
+        appMailVerp               <- fromMaybe VerpNone . join <$> (o .:? "mail-verp" <|> pure Nothing)
         appMailSupport            <- o .: "mail-support"
 
         appJobWorkers             <- o .:  "job-workers"