From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 30 Oct 2018 09:15:25 +0000 (+0100)
Subject: merge munin_ip v4 and v6 into one rule
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cc26d6ec0e7eff99c072eae7daaa26ff03edd3cf;p=mirror%2Fdsa-puppet.git

merge munin_ip v4 and v6 into one rule
---

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index c504725fb..f01705098 100644
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -5,7 +5,7 @@ rescue
 	''
 end
 %>);
-def $MUNIN6_IPS = (<%=
+def $MUNIN_IPS = ($MUNIN_IPS <%=
 begin
 	scope.lookupvar('site::nodeinfo')['misc']['v6addrs'].join(' ')
 rescue
@@ -13,26 +13,5 @@ rescue
 end
 %>);
 
-domain ip {
-        chain INPUT {
-               daddr ($MUNIN_IPS) NOP;
-        }
-}
-
-domain ip {
-        chain OUTPUT {
-               saddr ($MUNIN_IPS) NOP;
-        }
-}
-
-domain ip6 {
-        chain INPUT {
-               daddr ($MUNIN6_IPS) NOP;
-        }
-}
-
-domain ip6 {
-        chain OUTPUT {
-               saddr ($MUNIN6_IPS) NOP;
-        }
-}
+domain (ip ip6) { chain INPUT  { daddr ($MUNIN_IPS) NOP; } }
+domain (ip ip6) { chain OUTPUT { saddr ($MUNIN_IPS) NOP; } }