diff --git a/config/settings.yml b/config/settings.yml index 5d0702621..1f547b1dc 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -24,9 +24,9 @@ mail-from: email: "_env:MAILFROM_EMAIL:uniworx@localhost" mail-object-domain: "_env:MAILOBJECT_DOMAIN:localhost" mail-use-replyto-instead-sender: "_env:MAIL_USES_REPLYTO:true" -#mail-reroute-to: -# name: "_env:MAIL_REROUTE_TO_NAME:Steffen Jost" -# email: "_env:MAIL_REROUTE_TO_EMAL:jost@tcs.ifi.lmu.de" +mail-reroute-to: + name: "_env:MAIL_REROUTE_TO_NAME:" + email: "_env:MAIL_REROUTE_TO_EMAIL:" #mail-verp: # separator: "_env:VERP_SEPARATOR:+" # prefix: "_env:VERP_PREFIX:bounce" diff --git a/src/Settings.hs b/src/Settings.hs index d32833521..2d5ab05de 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -657,7 +657,7 @@ instance FromJSON AppSettings where appMailVerp <- fromMaybe VerpNone . join <$> (o .:? "mail-verp" <|> pure Nothing) appMailRetainSent <- o .: "mail-retain-sent" appMailSupport <- o .: "mail-support" - appMailRerouteTo <- o .:? "mail-reroute-to" + appMailRerouteTo <- join <$> (o .:? "mail-reroute-to" <|> pure Nothing) appJobWorkers <- o .: "job-workers" appJobFlushInterval <- o .:? "job-flush-interval" diff --git a/start.sh b/start.sh index 47701a357..f5c21989f 100755 --- a/start.sh +++ b/start.sh @@ -29,6 +29,8 @@ export RIBBON=${RIBBON:-${__HOST:-localhost}} export APPROOT=${APPROOT:-http://localhost:$((${PORT_OFFSET:-0} + 3000))} export AVSPASS=${AVSPASS:-nopasswordset} export PATH=${PATH:/home/jost/projects/fradrive} +export MAIL_REROUTE_TO_NAME='Steffen Jost' +export MAIL_REROUTE_TO_EMAIL=jost@tcs.ifi.lmu.de unset HOST move-back() {