From 229de1934d4e2023ae6f3e4c814d2a32c53775eb Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Fri, 11 Jul 2014 22:40:49 +0200 Subject: wibble --- roles/common/templates/etc/iptables/services.j2 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'roles/common/templates') diff --git a/roles/common/templates/etc/iptables/services.j2 b/roles/common/templates/etc/iptables/services.j2 index db7edf1..c1a8aa4 100644 --- a/roles/common/templates/etc/iptables/services.j2 +++ b/roles/common/templates/etc/iptables/services.j2 @@ -22,11 +22,17 @@ out tcp 636 # LDAPS {% endif %} {% if 'MX' in group_names %} in tcp 25 # SMTP +{% if 'MDA' not in group_names %} out tcp {{ postfix_instance.IMAP.port }} +{% endif %} +{% if 'lists' not in group_names %} out tcp {{ postfix_instance.lists.port }} {% endif %} +{% endif %} {% if 'out' in group_names %} +{% if groups.all | difference([inventory_hostname]) %} in tcp {{ postfix_instance.out.port }} +{% endif %} out tcp 25 # SMTP {% else %} out tcp {{ postfix_instance.out.port }} @@ -35,7 +41,7 @@ out tcp {{ postfix_instance.out.port }} in tcp 993 # IMAPS in tcp 4190 # ManageSieve {% endif %} -{% if 'MDA' in group_names %} +{% if 'MDA' in group_names and 'MX' not in group_names %} in tcp {{ postfix_instance.IMAP.port }} {% endif %} {% if 'MSA' in group_names %} @@ -43,6 +49,8 @@ in tcp 587 # SMTP-AUTH {% endif %} {% if 'webmail' in group_names %} in tcp 80,443 # HTTP/HTTPS +{% if 'IMAP' not in group_names %} out tcp 993 # IMAP out tcp 4190 {% endif %} +{% endif %} -- cgit v1.2.3