From dddd2f43aef1778d74aae590ece3eafb8c44898c Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 24 May 2021 00:23:34 +0200 Subject: [PATCH] More diabolical email hacks --- abra.sh | 4 ++-- postfix.cf.tmpl | 2 +- sender_logins | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abra.sh b/abra.sh index 49b8b3e..0ed0fbb 100644 --- a/abra.sh +++ b/abra.sh @@ -1,3 +1,3 @@ export CERTDUMPER_POST_VERSION=v1 -export POSTFIX_OVERRIDE_VERSION=v13 -export SENDER_LOGIN_VERSIONS=v1 +export POSTFIX_OVERRIDE_VERSION=v15 +export SENDER_LOGIN_VERSIONS=v2 diff --git a/postfix.cf.tmpl b/postfix.cf.tmpl index 862970a..c3084f8 100644 --- a/postfix.cf.tmpl +++ b/postfix.cf.tmpl @@ -18,5 +18,5 @@ relay_domains = regexp:/opt/mailman/var/data/postfix_domains \${podop}transport {{ if eq (env "SENDER_LOGINS_POSTFIX_OVERRIDES") "1" }} # https://github.com/Mailu/Mailu/issues/1096 -smtpd_sender_login_maps = unionmap:{${podop}senderlogin, pcre:/overrides/sender_logins} +smtpd_sender_login_maps = pcre:/overrides/sender_logins \${podop}senderlogin {{ end }} diff --git a/sender_logins b/sender_logins index 73b8f2c..4c84d34 100644 --- a/sender_logins +++ b/sender_logins @@ -1 +1 @@ -/.^*@order.biobulkbende.org/ noreply@biobulkbende.org +/.*@order.biobulkbende.org/ noreply@biobulkbende.org