From 8e104cec4ac378baaf04ece305d18761c7a4ed3f Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Wed, 14 Oct 2015 14:47:23 +0200
Subject: [PATCH] library/vars/isti-global.yml: Install and configure munin by
 default.

---
 iptables/templates/iptables-rules.v4.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/iptables/templates/iptables-rules.v4.j2 b/iptables/templates/iptables-rules.v4.j2
index 63c099d6..1b55c9cb 100644
--- a/iptables/templates/iptables-rules.v4.j2
+++ b/iptables/templates/iptables-rules.v4.j2
@@ -144,12 +144,14 @@
 {% endif %}
 {% endif %}
 
-{% if munin_server is defined and configure_munin is defined and configure_munin %}
+{% if configure_munin %}
+{% if munin_server %}
 {% for ip in munin_server %}
 # Munin
 -A INPUT -m state --state NEW -s {{ ip }} -p tcp -m tcp --dport 4949 -j ACCEPT
 {% endfor %}
 {% endif %}
+{% endif %}
 
 {% if ganglia_enabled %}
 {% if ganglia_gmond_cluster_port is defined %}