mirror of
				https://github.com/mail-in-a-box/mailinabox.git
				synced 2025-11-03 19:30:54 +00:00 
			
		
		
		
	Merge branch 'spf' into spf-srs
This commit is contained in:
		
						commit
						176e8272a0
					
				@ -42,7 +42,8 @@ source /etc/mailinabox.conf # load global vars
 | 
			
		||||
# * `ca-certificates`: A trust store used to squelch postfix warnings about
 | 
			
		||||
#   untrusted opportunistically-encrypted connections.
 | 
			
		||||
echo "Installing Postfix (SMTP server)..."
 | 
			
		||||
apt_install postfix postfix-sqlite postfix-pcre postgrey ca-certificates
 | 
			
		||||
apt_install postfix postfix-sqlite postfix-pcre postgrey ca-certificates \
 | 
			
		||||
	postfix-policyd-spf-python
 | 
			
		||||
 | 
			
		||||
# ### Basic Settings
 | 
			
		||||
 | 
			
		||||
@ -97,7 +98,9 @@ tools/editconf.py /etc/postfix/master.cf -s -w \
 | 
			
		||||
	  -o cleanup_service_name=authclean" \
 | 
			
		||||
	"authclean=unix  n       -       -       -       0       cleanup
 | 
			
		||||
	  -o header_checks=pcre:/etc/postfix/outgoing_mail_header_filters
 | 
			
		||||
	  -o nested_header_checks="
 | 
			
		||||
	  -o nested_header_checks=" \
 | 
			
		||||
	"policy-spf=unix  -       n       n       -       -       spawn
 | 
			
		||||
	  user=nobody argv=/usr/bin/policyd-spf"
 | 
			
		||||
 | 
			
		||||
# Install the `outgoing_mail_header_filters` file required by the new 'authclean' service.
 | 
			
		||||
cp conf/postfix_outgoing_mail_header_filters /etc/postfix/outgoing_mail_header_filters
 | 
			
		||||
@ -198,7 +201,7 @@ tools/editconf.py /etc/postfix/main.cf lmtp_destination_recipient_limit=1
 | 
			
		||||
# "450 4.7.1 Client host rejected: Service unavailable". This is a retry code, so the mail doesn't properly bounce. #NODOC
 | 
			
		||||
tools/editconf.py /etc/postfix/main.cf \
 | 
			
		||||
	smtpd_sender_restrictions="reject_non_fqdn_sender,reject_unknown_sender_domain,reject_authenticated_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","check_policy_service unix:private/policy-spf"
 | 
			
		||||
 | 
			
		||||
# 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).
 | 
			
		||||
@ -217,6 +220,7 @@ tools/editconf.py /etc/postfix/main.cf \
 | 
			
		||||
 | 
			
		||||
# Allow the two SMTP ports in the firewall.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
ufw_allow smtp
 | 
			
		||||
ufw_allow submission
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user