X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin.conf.erb;h=a1ba28b216dffccd9dbf8c54e5ed95aea1c4fbda;hb=9d399027c5b7a0f0255a8d37992b9631f6d91a80;hp=fc09288e23070ff95a0e3b660679d346838afb6f;hpb=e1320b1844a31f71bbeea888fd76ad55270f56ce;p=mirror%2Fdsa-puppet.git

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