Commit 9bf68f44 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Update postfix service to work behind port-proxy

parent b271302c

main.cf

+4 −4
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ smtpd_hard_error_limit = 12 
smtpd_client_restrictions =

	permit_mynetworks,

	permit_sasl_authenticated,

#	reject_rbl_client zen.spamhaus.org

#	warn_if_reject reject_unknown_client_hostname,

#	warn_if_reject reject_unknown_reverse_client_hostname

	reject_rbl_client zen.spamhaus.org

	warn_if_reject reject_unknown_client_hostname,

	warn_if_reject reject_unknown_reverse_client_hostname

	sleep 1, reject_unauth_pipelining,

	permit

smtpd_helo_required = yes
@@ -63,7 +63,7 @@ smtpd_recipient_restrictions = 
	reject_non_fqdn_recipient,

	reject_unknown_recipient_domain,

	defer_unauth_destination,

#	check_policy_service unix:private/policy-spf

	check_policy_service unix:private/policy-spf

	permit

#	sleep 1, reject_unauth_pipelining,

smtpd_data_restrictions =

master.cf

+15 −2
Original line number Diff line number Diff line
@@ -8,17 +8,30 @@ 
# service type  private unpriv  chroot  wakeup  maxproc command + args

#               (yes)   (yes)   (no)    (never) (100)

# ==========================================================================



# MX port

smtp      inet  n       -       n       -       -       smtpd



# PROXY enabled MX port for cluster external access

2525      inet  n       -       n       -       -       smtpd

  -o smtpd_upstream_proxy_protocol=haproxy



# Submission port for authenticated clients

submission inet n       -       n       -       -       smtpd

  -o smtpd_upstream_proxy_protocol=haproxy

  -o smtpd_tls_security_level=encrypt

  -o smtpd_sasl_auth_enable=yes

  -o smtpd_client_restrictions=permit_sasl_authenticated,reject

  -o milter_macro_daemon_name=ORIGINATING



# Alternative submission port for clients that do not support STARTTLS

smtps     inet  n       -       y       -       -       smtpd

  -o smtpd_upstream_proxy_protocol=haproxy

  -o smtpd_tls_wrappermode=yes

  -o smtpd_sasl_auth_enable=yes

  -o smtpd_client_restrictions=permit_sasl_authenticated,reject

  -o milter_macro_daemon_name=ORIGINATING



#628       inet  n       -       y       -       -       qmqpd

pickup    fifo  n       -       n       60      1       pickup

cleanup   unix  n       -       n       -       0       cleanup
@@ -109,5 +122,5 @@ scache unix - - n - 1 scache 




# SPF policy server

#policy-spf  unix  -     n       n       -       -       spawn

#  user=nobody argv=/usr/bin/policyd-spf
 
policy-spf  unix  -     n       n       -       -       spawn

  user=nobody argv=/usr/bin/policyd-spf