diff --git a/CHANGELOG.md b/CHANGELOG.md index 210864d0..7854a382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ - acmetool: replace cronjob with a systemd timer ([#719](https://github.com/chatmail/relay/pull/719)) +- remove xstore@testrun.org from default passthrough recipients + ([#722](https://github.com/chatmail/relay/pull/722)) + - don't deploy the website if there are merge conflicts in the www folder ([#714](https://github.com/chatmail/relay/pull/714)) diff --git a/chatmaild/src/chatmaild/ini/chatmail.ini.f b/chatmaild/src/chatmaild/ini/chatmail.ini.f index 0aeec0cc..094ef6e8 100644 --- a/chatmaild/src/chatmaild/ini/chatmail.ini.f +++ b/chatmaild/src/chatmaild/ini/chatmail.ini.f @@ -43,7 +43,7 @@ passthrough_senders = # list of e-mail recipients for which to accept outbound un-encrypted mails # (space-separated, item may start with "@" to whitelist whole recipient domains) -passthrough_recipients = xstore@testrun.org echo@{mail_domain} +passthrough_recipients = echo@{mail_domain} # path to www directory - documented here: https://github.com/chatmail/relay/#custom-web-pages #www_folder = www diff --git a/chatmaild/src/chatmaild/ini/override-testrun.ini b/chatmaild/src/chatmaild/ini/override-testrun.ini index f8bcb533..af337173 100644 --- a/chatmaild/src/chatmaild/ini/override-testrun.ini +++ b/chatmaild/src/chatmaild/ini/override-testrun.ini @@ -1,7 +1,7 @@ [privacy] -passthrough_recipients = privacy@testrun.org xstore@testrun.org echo@{mail_domain} +passthrough_recipients = privacy@testrun.org echo@{mail_domain} privacy_postal = Merlinux GmbH, Represented by the managing director H. Krekel,