Set the internal networks from config in Postfix/SA

roles/mail/templates/postfix-delivery/main.cf

@@ -6,7 +6,7 @@
 
 ldap = proxy:ldap:/etc/postfix/ldap/
 
-mynetworks = 127.0.0.0/8 [::1]/128 172.16.1.0/24
+mynetworks = 127.0.0.0/8 [::1]/128 {% for o in net_overlays %}{{ o.network }} {% endfor %}
 
 # Don't anvil(8) control the internal port.
 smtpd_client_connection_count_limit = 0

roles/mail/templates/postfix-out/main.cf

@@ -4,7 +4,7 @@
 
 ldap = proxy:ldap:/etc/postfix/ldap/
 
-mynetworks = 127.0.0.0/8 [::1]/128 172.16.1.0/24
+mynetworks = 127.0.0.0/8 [::1]/128 {% for o in net_overlays %}{{ o.network }} {% endfor %}
 
 smtpd_authorized_xforward_hosts = $mynetworks
 

roles/mail/templates/spamassassin/local.cf

@@ -11,8 +11,8 @@
 # The ring0 network is trusted, which implies that email originating
 # from them (not just relayed through) will usually not be considered
 # spam.
-trusted_networks 172.16.0.0/16
-internal_networks 172.16.0.0/16
+trusted_networks {% for o in net_overlays %}{{ o.network }} {% endfor %}
+internal_networks {% for o in net_overlays %}{{ o.network }} {% endfor %}
 
 lock_method flock