postfix: offer opening another smtpd on port 26

[ansible.git] / roles / email / templates / master.cf

diff --git a/roles/email/templates/master.cf b/roles/email/templates/master.cf
index e6eeb149766489f2c7b4e4604c54d81bb3ef78b7..1d3a3e8e39abb3f849fd9431a492af7878d23eae 100644 (file)
--- a/roles/email/templates/master.cf
+++ b/roles/email/templates/master.cf
@@ -17,6 +17,12 @@ tlsproxy   unix  -       -       y       -       0       tlsproxy
 {% else %}
 smtp      inet  n       -       y       -       -       smtpd
 {% endif %}
+{% if postfix.smtpd_26 is defined and postfix.smtpd_26 %}
+26      inet  n       -       y       -       -       smtpd
+  -o syslog_name=postfix/smtpd2
+  -o smtpd_tls_security_level=encrypt
+  -o smtpd_recipient_restrictions=permit_mynetworks,permit_tls_clientcerts,reject
+{% endif %}
 
 {% if postfix.submission is defined and postfix.submission %}
 submission inet  n       -       y       -       -       smtpd
@@ -41,7 +47,20 @@ verify    unix  -       -       y       -       1       verify
 flush     unix  n       -       y       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
+{% if postfix.smtp_outgoing is defined %}
+{% for item in postfix.smtp_outgoing %}
+{{item.name}} unix  -       -       -       -       -       smtp
+  -o smtp_helo_name={{item.hostname}}
+  -o smtp_bind_address={{item.ip}}
+{% if item.ip_v6 is defined %}
+  -o smtp_bind_address6={{item.ip_v6}}
+{% else %}
+  -o inet_protocols=ipv4
+{% endif %}
+{% endfor %}
+{% else %}
 smtp      unix  -       -       y       -       -       smtp
+{% endif %}
 relay     unix  -       -       y       -       -       smtp
 #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
 showq     unix  n       -       y       -       -       showq