docker/myvemail
1
0
Fork 0
mirror of https://git.myvelabs.com/docker/myvemail.git synced 2025-12-17 21:26:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved whitelist ahead of policyd-spf check

Browse source
This commit is contained in:
myve 2025-03-18 00:16:45 +00:00
commit d3377b860a
5 changed files with 22 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/run/docker-entrypoint/entrypoint.sh
View file

@ -43,4 +43,4 @@ postfix reload &&
echo -e "\n\e[1;32mMail service is ready\e[0m\n"
# Monitor log
tail -f /var/log/mail/maillog.debug{,.0} # /var/log/mail/maillog{,.0}
tail -F /var/log/mail/maillog.debug{,.0} # /var/log/mail/maillog{,.0}

2
build/run/docker-entrypoint/init.d/30-postfix.sh
View file

@ -46,7 +46,7 @@ then
addwhitelist_helo=(${MYVEMAIL_WHITELIST_HELO//,/ })
for whitelist_helo in ${addwhitelist_helo[@]}
do
echo "/${whitelist_helo//./\\.}/ OK Whitelisted SPF" | tee -a /etc/postfix/helo_access >/dev/null
echo "/${whitelist_helo//./\\.}/ OK Whitelisted SPF" | tee -a /etc/postfix/{helo_access,whitelisted_domains} >/dev/null
done
fi

4
build/run/installer.sh
View file

@ -90,7 +90,7 @@ postconf -e "smtp_header_checks = pcre:/etc/postfix/smtp_header_checks"
# SPF and DKIM checks
postconf -e "policy_time_limit = 3600"
postconf -e "smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_policy_service unix:private/policy, check_client_access pcre:/etc/postfix/whitelisted_domains, check_sender_access lmdb:/etc/postfix/whitelisted_emails, check_client_access pcre:/etc/postfix/blacklisted_domains, check_sender_access lmdb:/etc/postfix/blacklisted_emails"
postconf -e "smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_client_access pcre:/etc/postfix/whitelisted_domains, check_sender_access lmdb:/etc/postfix/whitelisted_emails, check_client_access pcre:/etc/postfix/blacklisted_domains, check_sender_access lmdb:/etc/postfix/blacklisted_emails, check_policy_service unix:private/policyd-spf"
# Milter configuration
postconf -e "milter_default_action = accept"
@ -135,7 +135,7 @@ submission inet n - y - - smtpd
-o smtpd_sasl_path=private/auth
# SPF Policy
policy unix - n n - - spawn
policyd-spf unix - n n - - spawn
user=nobody argv=/usr/bin/perl ${MYVEMAIL_POLICYD}
master.cf