setup-all-dchroots: move all main code to after function declarations

[mirror/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 82bdb09..c504725 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
+       scope.lookupvar('site::nodeinfo')['misc']['v4addrs'].join(' ')
+rescue
+       ''
+end
+%>);
+def $MUNIN6_IPS = (<%=
+begin
+       scope.lookupvar('site::nodeinfo')['misc']['v6addrs'].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;
+        }
+}