massive style guide fixups

[dsa-puppet.git] / modules / ferm / templates / interfaces.conf.erb

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 82bdb0925a4e6819810409c8043abf1f4435c239..fbe960266d9437ecd742599883c738d788e28f69 100644 (file)
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,4 +1,17 @@
-def $MUNIN_IPS = (<%= v4ips.split(',').join(' ') %>);
+def $MUNIN_IPS = (<%=
+begin
+       v4ips.split(',').join(' ')
+rescue
+       ''
+end
+%>);
+def $MUNIN6_IPS = (<%=
+begin
+       v6ips == '' ? '' : v6ips.split(',').join(' ')
+rescue
+       ''
+end
+%>);
 
 domain ip {
         chain INPUT {
@@ -11,3 +24,15 @@ domain ip {
                saddr ($MUNIN_IPS) NOP;
         }
 }
+
+domain ip6 {
+        chain INPUT {
+               daddr ($MUNIN6_IPS) NOP;
+        }
+}
+
+domain ip6 {
+        chain OUTPUT {
+               saddr ($MUNIN6_IPS) NOP;
+        }
+}