X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin.conf.erb;h=a1ba28b216dffccd9dbf8c54e5ed95aea1c4fbda;hb=c9fcdba74543444f85f85d08307a67c9c04d4473;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..a1ba28b21 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 + '
 
@@ -21,3 +21,9 @@ graph_strategy cgi
     end
 out
 %>
+
+<% unless localinfo.keys.include?('rietz.debian.org') -%>
+# Not in puppet
+[rietz.debian.org]
+    address rietz.debian.org
+<% end -%>