X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fconf.d-munin-interfaces.conf.erb;h=7a4c02610990f47e46c909a3e32cab188e81424b;hb=013262d64aa0d8519074c9c5028d78d0beab4ef5;hp=f017050985a632f233f87a476b9fd851ba2a6319;hpb=285329e7458a2ef552135d8f5002eadd81a29806;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/conf.d-munin-interfaces.conf.erb b/modules/ferm/templates/conf.d-munin-interfaces.conf.erb
index f01705098..7a4c02610 100644
--- a/modules/ferm/templates/conf.d-munin-interfaces.conf.erb
+++ b/modules/ferm/templates/conf.d-munin-interfaces.conf.erb
@@ -1,17 +1,14 @@
 def $MUNIN_IPS = (<%=
 begin
-	scope.lookupvar('site::nodeinfo')['misc']['v4addrs'].join(' ')
+	scope.lookupvar('deprecated::nodeinfo')['misc']['v4addrs'].join(' ')
 rescue
 	''
 end
 %>);
 def $MUNIN_IPS = ($MUNIN_IPS <%=
 begin
-	scope.lookupvar('site::nodeinfo')['misc']['v6addrs'].join(' ')
+	scope.lookupvar('deprecated::nodeinfo')['misc']['v6addrs'].join(' ')
 rescue
 	''
 end
 %>);
-
-domain (ip ip6) { chain INPUT  { daddr ($MUNIN_IPS) NOP; } }
-domain (ip ip6) { chain OUTPUT { saddr ($MUNIN_IPS) NOP; } }