From e090edee15cd0f07c9d30d6fc35d4523664df4a5 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Sat, 10 Oct 2015 09:03:24 +0200 Subject: [PATCH] infrastructure-services/group_vars/all/all.yml: remove redundant variables. --- iptables/templates/iptables-rules.v4.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iptables/templates/iptables-rules.v4.j2 b/iptables/templates/iptables-rules.v4.j2 index 477190c..cf430e2 100644 --- a/iptables/templates/iptables-rules.v4.j2 +++ b/iptables/templates/iptables-rules.v4.j2 @@ -165,7 +165,7 @@ {% endif %} {% endif %} -{% if postfix_relay_server is defined and postfix_relay_server %} +{% if postfix_relay_server %} # # These are only needed on the machines that act as relay servers # @@ -179,7 +179,7 @@ -A OUTPUT -p tcp -m multiport --dports 25,587,465 -m state --state NEW -j LOG --log-prefix "LOCAL_DROPPED_SPAM " --log-uid -A OUTPUT -p tcp -m multiport --dports 25,587,465 -j DROP {% endif %} -{% if postfix_relay_server is defined and not postfix_relay_server %} +{% if not postfix_relay_server %} # # When we are not a relay server but we want send email using our relay -A OUTPUT -p tcp -m multiport --dports 25,587,465 -s 127.0.0.1 -d 127.0.0.1 -j ACCEPT