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=37fc7d668b2b33097abd7485c91e3f1be8c2b830;hpb=aa54b06448c4a5a94a1edf3699f29c91127bb7a7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb
index 37fc7d668..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,7 +12,7 @@ graph_strategy cgi
 
 <%= out = ''
     localinfo.keys.sort.each do |node|
-       if localinfo[node]['no_munin'] != "true"
+       if not localinfo[node]['no_munin']
           out += '[' + node + ']
     address ' + node + '