github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Postfix configuration in start-mailserver.sh for regex (#1754)

Browse source 
* fixes tomav#1437
This commit is contained in:
Georg Lauterbach 2021-01-19 12:31:45 +01:00 committed by GitHub
parent 221d4ce187
commit e40c2593cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
target/scripts/start-mailserver.sh
View file

@ -128,6 +128,7 @@ function register_functions
_register_setup_function "_setup_postfix_postscreen" _register_setup_function "_setup_postfix_postscreen"
_register_setup_function "_setup_postfix_sizelimits" _register_setup_function "_setup_postfix_sizelimits"
# needs to come after _setup_postfix_aliases
[[ ${SPOOF_PROTECTION} -eq 1 ]] && _register_setup_function "_setup_spoof_protection" [[ ${SPOOF_PROTECTION} -eq 1 ]] && _register_setup_function "_setup_spoof_protection"
if [[ ${ENABLE_SRS} -eq 1 ]] if [[ ${ENABLE_SRS} -eq 1 ]]
@ -866,10 +867,21 @@ function _setup_postfix_smtputf8
function _setup_spoof_protection function _setup_spoof_protection
{ {
_notify 'inf' "Configuring Spoof Protection" _notify 'inf' "Configuring Spoof Protection"
sed -i 's|smtpd_sender_restrictions =|smtpd_sender_restrictions = reject_authenticated_sender_login_mismatch,|' /etc/postfix/main.cf sed -i \
's+smtpd_sender_restrictions =+smtpd_sender_restrictions = reject_authenticated_sender_login_mismatch,+' \
/etc/postfix/main.cf
# shellcheck disable=SC2015 if [[ ${ENABLE_LDAP} -eq 1 ]]
[[ ${ENABLE_LDAP} -eq 1 ]] && postconf -e "smtpd_sender_login_maps=ldap:/etc/postfix/ldap-users.cf ldap:/etc/postfix/ldap-aliases.cf ldap:/etc/postfix/ldap-groups.cf" || postconf -e "smtpd_sender_login_maps=texthash:/etc/postfix/virtual, hash:/etc/aliases, pcre:/etc/postfix/regexp, pcre:/etc/postfix/maps/sender_login_maps.pcre" then
postconf -e "smtpd_sender_login_maps = ldap:/etc/postfix/ldap-users.cf ldap:/etc/postfix/ldap-aliases.cf ldap:/etc/postfix/ldap-groups.cf"
else
if [[ -f /etc/postfix/regexp ]]
then
postconf -e "smtpd_sender_login_maps = unionmap:{ texthash:/etc/postfix/virtual, hash:/etc/aliases, pcre:/etc/postfix/maps/sender_login_maps.pcre, pcre:/etc/postfix/regexp }"
else
postconf -e "smtpd_sender_login_maps = texthash:/etc/postfix/virtual, hash:/etc/aliases, pcre:/etc/postfix/maps/sender_login_maps.pcre"
fi
fi
} }
function _setup_postfix_access_control function _setup_postfix_access_control
@ -1032,10 +1044,9 @@ function _setup_postfix_aliases
_notify 'inf' "Adding regexp alias file postfix-regexp.cf" _notify 'inf' "Adding regexp alias file postfix-regexp.cf"
cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp cp -f /tmp/docker-mailserver/postfix-regexp.cf /etc/postfix/regexp
sed -i -e '/^virtual_alias_maps/{ sed -i -E \
s/ pcre:.*// 's+virtual_alias_maps(.*)+virtual_alias_maps\1 pcre:/etc/postfix/regexp+g' \
s/$/ pcre:\/etc\/postfix\/regexp/ /etc/postfix/main.cf
}' /etc/postfix/main.cf
fi fi
_notify 'inf' "Configuring root alias" _notify 'inf' "Configuring root alias"