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

diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index b223bd650..35e4bf0d4 100644
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,13 +3,29 @@
 ### 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" -%>
+
+dbdir   /var/lib/munin
+htmldir /var/cache/munin/www
+logdir  /var/log/munin
+rundir  /var/run/munin
+tmpldir /etc/munin/templates
+
 <%= out = ''
     scope.lookupvar('site::localinfo').keys.sort.each do |node|
        if not scope.lookupvar('site::localinfo')[node]['no_munin']
@@ -21,3 +37,4 @@ graph_strategy cgi
     end
 out
 %>
+<% end -%>