Mercurial > repos > other > Puppet

comparison modules/postfix/templates/master.cf.epp @ 318:6c89e2c3b5aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix outbound mail IP Moved smtp_bind_address to the place where it makes a difference - the SMTP (not SMTPD) service!
author IBBoard <dev@ibboard.co.uk>
date Sat, 29 Feb 2020 14:08:49 +0000
parents 84a575614d3c
children 6d719622c72f
comparison
equal deleted inserted replaced
317:2a20a5b7f65a 318:6c89e2c3b5aa
34 -o receive_override_options=no_address_mappings 34 -o receive_override_options=no_address_mappings
35 -o smtpd_sasl_auth_enable=no 35 -o smtpd_sasl_auth_enable=no
36 36
37 [<%= $mailserver_proxy %>]:smtps inet n - n - - smtpd 37 [<%= $mailserver_proxy %>]:smtps inet n - n - - smtpd
38 -o smtpd_upstream_proxy_protocol=haproxy 38 -o smtpd_upstream_proxy_protocol=haproxy
39 -o smtp_bind_address6=<%= $mailserver_ip %>
40 -o smtpd_tls_wrappermode=yes 39 -o smtpd_tls_wrappermode=yes
41 -o smtpd_sasl_auth_enable=yes 40 -o smtpd_sasl_auth_enable=yes
42 -o smtpd_client_restrictions=permit_sasl_authenticated,reject 41 -o smtpd_client_restrictions=permit_sasl_authenticated,reject
43 -o milter_macro_daemon_name=ORIGINATING 42 -o milter_macro_daemon_name=ORIGINATING
44 43
45 [<%= $mailserver_proxy %>]:submission inet n - n - - smtpd 44 [<%= $mailserver_proxy %>]:submission inet n - n - - smtpd
46 -o smtpd_upstream_proxy_protocol=haproxy 45 -o smtpd_upstream_proxy_protocol=haproxy
47 -o smtp_bind_address6=<%= $mailserver_ip %>
48 -o smtpd_tls_security_level=encrypt 46 -o smtpd_tls_security_level=encrypt
49 -o smtpd_sasl_auth_enable=yes 47 -o smtpd_sasl_auth_enable=yes
50 -o smtpd_client_restrictions=permit_sasl_authenticated,reject 48 -o smtpd_client_restrictions=permit_sasl_authenticated,reject
51 -o milter_macro_daemon_name=ORIGINATING 49 -o milter_macro_daemon_name=ORIGINATING
52 <%- } -%> 50 <%- } -%>
78 verify unix - - n - 1 verify 76 verify unix - - n - 1 verify
79 flush unix n - n 1000? 0 flush 77 flush unix n - n 1000? 0 flush
80 proxymap unix - - n - - proxymap 78 proxymap unix - - n - - proxymap
81 proxywrite unix - - n - 1 proxymap 79 proxywrite unix - - n - 1 proxymap
82 smtp unix - - n - - smtp 80 smtp unix - - n - - smtp
81 <%- if $mailserver_ip =~ Stdlib::IP::Address::V6 { -%>
82 -o smtp_bind_address6=<%= $mailserver_ip %>
83 <%- } else { -%>
84 -o smtp_bind_address=<%= $mailserver_ip %>
85 <%- } -%>
83 # When relaying mail as backup MX, disable fallback_relay to avoid MX loops 86 # When relaying mail as backup MX, disable fallback_relay to avoid MX loops
84 relay unix - - n - - smtp 87 relay unix - - n - - smtp
85 -o smtp_fallback_relay= 88 -o smtp_fallback_relay=
86 # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 89 # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
87 showq unix n - n - - showq 90 showq unix n - n - - showq