external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-08-15 06:10:55 +00:00
Code Issues Releases Wiki Activity

fixed conflicting edits for smtpd_sasl_auth_enable

Browse Source
This commit is contained in:
Jeff Volkenant 2019-01-17 12:23:53 -08:00
parent b827d0b21d
commit ca4027cadd
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/mail-postfix.sh
View File

@ -201,11 +201,6 @@ tools/editconf.py /etc/postfix/main.cf \
smtpd_sender_restrictions="permit_mynetworks,reject_non_fqdn_sender,reject_unknown_sender_domain,reject_sender_login_mismatch,reject_rhsbl_sender dbl.spamhaus.org" \ smtpd_sender_restrictions="permit_mynetworks,reject_non_fqdn_sender,reject_unknown_sender_domain,reject_sender_login_mismatch,reject_rhsbl_sender dbl.spamhaus.org" \
smtpd_recipient_restrictions=permit_sasl_authenticated,permit_mynetworks,"reject_rbl_client zen.spamhaus.org",reject_unlisted_recipient,"check_policy_service inet:127.0.0.1:10023" smtpd_recipient_restrictions=permit_sasl_authenticated,permit_mynetworks,"reject_rbl_client zen.spamhaus.org",reject_unlisted_recipient,"check_policy_service inet:127.0.0.1:10023"
# There was a change from Ubuntu 14.04 to 18.04 with how postfix handles SASL checks.
# smtpd_sasl_auth_enable=yes must be set for reject_sender_login_mismatch
tools/editconf.py /etc/postfix/main.cf smtpd_sasl_auth_enable=yes
# Postfix connects to Postgrey on the 127.0.0.1 interface specifically. Ensure that # Postfix connects to Postgrey on the 127.0.0.1 interface specifically. Ensure that
# Postgrey listens on the same interface (and not IPv6, for instance). # Postgrey listens on the same interface (and not IPv6, for instance).
# A lot of legit mail servers try to resend before 300 seconds. # A lot of legit mail servers try to resend before 300 seconds.

10
setup/mail-users.sh
View File

@ -65,15 +65,13 @@ service auth {
} }
EOF EOF
# And have Postfix use that service. We *disable* it here # And have Postfix use that service.
# so that authentication is not permitted on port 25 (which # Starting with Ubuntu Bionic, smtpd_sasl_auth_enable=yes is required
# does not run DKIM on relayed mail, so outbound mail isn't # for certain main.cf options to function.
# correct, see #830), but we enable it specifically for the
# submission port.
tools/editconf.py /etc/postfix/main.cf \ tools/editconf.py /etc/postfix/main.cf \
smtpd_sasl_type=dovecot \ smtpd_sasl_type=dovecot \
smtpd_sasl_path=private/auth \ smtpd_sasl_path=private/auth \
smtpd_sasl_auth_enable=no smtpd_sasl_auth_enable=yes
# ### Sender Validation # ### Sender Validation