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=b1d9067744a4d05d635b0b484c4f9bc3abd5bfd3;hpb=1ab08131bf085d9f000c9ee159819579efc2413e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb
index b1d906774..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
@@ -22,7 +22,8 @@ graph_strategy cgi
 out
 %>
 
+<% unless localinfo.keys.include?('rietz.debian.org') -%>
 # Not in puppet
 [rietz.debian.org]
     address rietz.debian.org
-
+<% end -%>