X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Finterfaces.conf.erb;fp=modules%2Fferm%2Ftemplates%2Finterfaces.conf.erb;h=f017050985a632f233f87a476b9fd851ba2a6319;hb=cc26d6ec0e7eff99c072eae7daaa26ff03edd3cf;hp=c504725fba976bdcf62a1599b062336fc9af98eb;hpb=219b67fad2b10525a81d4cd44e8f9a6269635abc;p=mirror%2Fdsa-puppet.git

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; } }