X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin.conf.erb;h=35e4bf0d46b2024410d6c963ea426dcf96795c1d;hb=1682834df298fce0a524a2be9100d016b133bc74;hp=519e033a6e73008c51c7012b4de133c09d3e0d95;hpb=0ad5c1956a6e44f1d7ef04641a6fa0b03a6bec34;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index 519e033a6..35e4bf0d4 100644
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,6 +3,19 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<% if hostname != "menotti" -%>
+
+dbdir   /var/lib/munin
+htmldir /var/cache/munin/www
+logdir  /var/log/munin
+rundir  /var/run/munin
+tmpldir /etc/munin/templates
+
+<% end -%>
+
+
+graph_strategy cgi
+
 includedir /etc/munin/munin-conf.d
 
 <% if hostname != "menotti" -%>
@@ -12,7 +25,6 @@ htmldir /var/cache/munin/www
 logdir  /var/log/munin
 rundir  /var/run/munin
 tmpldir /etc/munin/templates
-graph_strategy cgi
 
 <%= out = ''
     scope.lookupvar('site::localinfo').keys.sort.each do |node|