More munin stuff, supporting munin-async if it is on the client

[mirror/dsa-puppet.git] / modules / munin / templates / munin.conf.erb

diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index b223bd6..519e033 100644 (file)
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,6 +3,10 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+includedir /etc/munin/munin-conf.d
+
+<% if hostname != "menotti" -%>
+
 dbdir   /var/lib/munin
 htmldir /var/cache/munin/www
 logdir  /var/log/munin
@@ -21,3 +25,4 @@ graph_strategy cgi
     end
 out
 %>
+<% end -%>