X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin.conf.erb;h=50468cb5da97383a1823070579c3cc5c5bce3a8a;hb=c9f2e86aacb0d9338081cde2d90cb5979cd045f1;hp=c04c5cca51563b5328f34f0ca24b86470d315821;hpb=e152ea9072eba0cf0b3920c779e3fdb8ad3880fd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb
index c04c5cca5..50468cb5d 100644
--- a/modules/munin-node/templates/munin.conf.erb
+++ b/modules/munin-node/templates/munin.conf.erb
@@ -4,7 +4,7 @@
 ##
 
 dbdir   /var/lib/munin
-htmldir /var/www/munin
+htmldir /var/cache/munin/www
 logdir  /var/log/munin
 rundir  /var/run/munin
 tmpldir /etc/munin/templates
@@ -12,10 +12,12 @@ graph_strategy cgi
 
 <%= out = ''
     localinfo.keys.sort.each do |node|
-       out += '[ ' + node + ' ]
+       if not localinfo[node]['no_munin']
+          out += '[' + node + ']
     address ' + node + '
 
 '
-     end
+       end 
+    end
 out
 %>