majic-ansible-roles File Diff

File diff 8944b8348567 → 441a70c073b9

roles/mail_forwarder/templates/ferm_mail.conf.j2

➞

Show inline comments

 {% if smtp_relay_host and smtp_from_relay_allowed %}
 {% if smtp_relay_host_ipv4 %}
 domain ip {
     # Accept incoming connections on port 25 from SMTP relay host.
     table filter {
         chain INPUT {
             # SMTP for server communication.
             proto tcp dport 25 {
                 saddr {{ smtp_relay_host }} ACCEPT;
 {% for address in smtp_relay_host_ipv4 %}
                 saddr {{ address }} ACCEPT;
 {% endfor %}
+            }
+        }
+    }
+}
 {% endif %}
-{% if lookup('dig', smtp_relay_host + '/AAAA') not in ['NXDOMAIN', ''] %}
+{% if smtp_relay_host_ipv6 %}
 domain ip6 {
     # Accept incoming connections on port 25 from SMTP relay host.
     table filter {
         chain INPUT {
             # SMTP for server communication.
             proto tcp dport 25 {
                 saddr {{ smtp_relay_host }} ACCEPT;
 {% for address in smtp_relay_host_ipv6 %}
                 saddr {{ address }} ACCEPT;
 {% endfor %}
+            }
+        }
+    }