X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Finterfaces.conf.erb;h=496054c42de201af4857a70e1bf031adb56711e4;hb=38339aa5456ff34cbc8bb5ba8b7690799d341d48;hp=17c0c6674ce884ffacd94f8d65d0eecfbafb9351;hpb=b518be1306dde4a620e067aa85904ec0e99eb705;p=dsa-puppet.git

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 17c0c667..496054c4 100644
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,8 +1,38 @@
-$MUNIN_IFS = (<%=
-ifs = []
-interfaces.split(',').each do |iface|
-  next unless Kernel.local_variables.include?("ipaddress_" + iface)
-  ifs << iface
-ifs.join(' ')
+def $MUNIN_IPS = (<%=
+begin
+	scope.lookupvar('::v4ips').split(',').join(' ')
+rescue
+	''
+end
 %>);
+def $MUNIN6_IPS = (<%=
+begin
+	scope.lookupvar('::v6ips') == '' ? '' : scope.lookupvar('::v6ips').split(',').join(' ')
+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;
+        }
+}