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

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index db39f1475..496054c42 100644
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,5 +1,17 @@
-def $MUNIN_IPS = (<%= v4ips.split(',').join(' ') %>);
-def $MUNIN6_IPS = (<%= v6ips == 'no' ? '' : v6ips.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 {