X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin-node.conf.erb;h=31573f476ea414a4455d1b8795ffa025d6cbd928;hb=ecf587153c5a66ac2c3fef792dd89d9182de723c;hp=73eab95e6b03ecbbad2af46fc1bad026d060fc31;hpb=d7475f90c56697e9589e1386ced135498df68c81;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/templates/munin-node.conf.erb b/modules/munin-node/templates/munin-node.conf.erb
index 73eab95e6..31573f476 100644
--- a/modules/munin-node/templates/munin-node.conf.erb
+++ b/modules/munin-node/templates/munin-node.conf.erb
@@ -12,7 +12,7 @@ log_file /var/log/munin/munin-node.log
 port 4949
 pid_file /var/run/munin/munin-node.pid
 background 1
-setseid 1
+setsid 1
 
 # Which port to bind to;
 host *
@@ -42,7 +42,8 @@ ignore_file \.rpm(save|new)$
 str = ''
 localinfo.keys.sort.each do |node|
    if localinfo[node]['muninmaster']
-      ldapall[node]['ipHostNumber'].each do |ip|
+      next unless allnodeinfo[node]['ipHostNumber']
+      allnodeinfo[node]['ipHostNumber'].each do |ip|
          str += "allow ^" + ip.split('.').join('\.') + "$\n"
       end
    end