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

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index ee7e2c075..496054c42 100644
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,11 +1,17 @@
 def $MUNIN_IPS = (<%=
 begin
-	v4ips.split(',').join(' ')
+	scope.lookupvar('::v4ips').split(',').join(' ')
+rescue
+	''
+end
+%>);
+def $MUNIN6_IPS = (<%=
+begin
+	scope.lookupvar('::v6ips') == '' ? '' : scope.lookupvar('::v6ips').split(',').join(' ')
 rescue
 	''
 end
 %>);
-def $MUNIN6_IPS = (<%= v6ips == 'no' ? '' : v6ips.split(',').join(' ') %>);
 
 domain ip {
         chain INPUT {