X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin-node.conf.erb;h=b740afe34f0f7260b06fdd4b38eefadae0ead2a7;hb=3a63826fbd692815168b7d2e67d0ff978069fbb3;hp=e5ef6ff7da7012eaefd07880e940143d24d65569;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git diff --git a/modules/munin/templates/munin-node.conf.erb b/modules/munin/templates/munin-node.conf.erb index e5ef6ff7d..b740afe34 100644 --- a/modules/munin/templates/munin-node.conf.erb +++ b/modules/munin/templates/munin-node.conf.erb @@ -38,14 +38,14 @@ ignore_file \.rpm(save|new)$ # doesn't understand CIDR-style network notation. You may repeat # the allow line as many times as you'd like +allow ^127\.0\.0\.1$ <%= str = '' -scope.lookupvar('site::localinfo').keys.sort.each do |node| - if scope.lookupvar('site::localinfo')[node]['muninmaster'] - scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip| +roles = scope.lookupvar('deprecated::roles') +roles['muninmaster'].each do |node| + scope.lookupvar('deprecated::allnodeinfo')[node]['ipHostNumber'].each do |ip| str += "allow ^" + ip.split('.').join('\.') + "$\n" end - end end str -%>