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

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