summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2016-07-10 05:39:25 +0200
committerGuilhem Moulin <guilhem@fripost.org>2016-07-10 05:40:30 +0200
commitd5927fb7247e881655488b850812e8186ae444a4 (patch)
treefc471cc247dceff6c6f0c0c29f41c414443688b9
parentbf960a066466d7719ada8fe7bc3dec99d237b88a (diff)
Postfix lists/MDA instances: only include the MX:es' IPs in $mynetworks.
-rw-r--r--roles/IMAP/templates/etc/postfix/main.cf.j24
-rw-r--r--roles/lists/templates/etc/postfix/main.cf.j24
2 files changed, 6 insertions, 2 deletions
diff --git a/roles/IMAP/templates/etc/postfix/main.cf.j2 b/roles/IMAP/templates/etc/postfix/main.cf.j2
index faf17de..a879d28 100644
--- a/roles/IMAP/templates/etc/postfix/main.cf.j2
+++ b/roles/IMAP/templates/etc/postfix/main.cf.j2
@@ -19,7 +19,9 @@ append_dot_mydomain = no
mynetworks = 127.0.0.0/8, [::1]/128
{%- if groups.all | length > 1 -%}
- , {{ ipsec_subnet }}
+{%- for mx in groups.MX | sort -%}
+ , {{ ipsec[ hostvars[mx].inventory_hostname_short ] | ipaddr }}
+{%- endfor %}
{% endif %}
queue_directory = /var/spool/postfix-{{ postfix_instance[inst].name }}
diff --git a/roles/lists/templates/etc/postfix/main.cf.j2 b/roles/lists/templates/etc/postfix/main.cf.j2
index 933d540..07b27a6 100644
--- a/roles/lists/templates/etc/postfix/main.cf.j2
+++ b/roles/lists/templates/etc/postfix/main.cf.j2
@@ -19,7 +19,9 @@ append_dot_mydomain = no
mynetworks = 127.0.0.0/8, [::1]/128
{%- if groups.all | length > 1 -%}
- , {{ ipsec_subnet }}
+{%- for mx in groups.MX | sort -%}
+ , {{ ipsec[ hostvars[mx].inventory_hostname_short ] | ipaddr }}
+{%- endfor %}
{% endif %}
queue_directory = /var/spool/postfix-{{ postfix_instance[inst].name }}