X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Finterfaces.conf.erb;h=496054c42de201af4857a70e1bf031adb56711e4;hb=adf743f337b2a54c38e9dbe793c0276b8f5416ea;hp=1bebce3676545cfc8c393ba6ca135deae6d7f6c8;hpb=c16e21d49bdc83e4ba73436ab7cbbd521e989ced;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 1bebce367..496054c42 100644
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,13 +1,38 @@
-def $MUNIN_IPS = (<%= v4ips.split(',').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_IP) NOP;
+               daddr ($MUNIN_IPS) NOP;
         }
 }
 
 domain ip {
         chain OUTPUT {
-               saddr ($MUNIN_IP) NOP;
+               saddr ($MUNIN_IPS) NOP;
+        }
+}
+
+domain ip6 {
+        chain INPUT {
+               daddr ($MUNIN6_IPS) NOP;
+        }
+}
+
+domain ip6 {
+        chain OUTPUT {
+               saddr ($MUNIN6_IPS) NOP;
         }
 }