Reduce munin-html fork count to the minimum

[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 532f76343c52d23817ced151798ef286dd50ba3d..e335a00f37d6ac4b9dba1684d5d678d2938d2228 100644 (file)
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,42 +3,14 @@
 ### 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
-
-<% else -%>
 # number of updaters to run
 max_processes 96
 rrdcached_socket /var/run/munin/rrdcached.sock/sock
 
 #html_strategy cgi
-<% end -%>
 graph_strategy cgi
 
-includedir /etc/munin/munin-conf.d
-
-<% if hostname != "menotti" -%>
+# Reduce memory usage spikes and OOM mails
+max_html_jobs 1
 
-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']
-          out += '[' + node + ']
-    address ' + node + '
-
-'
-       end 
-    end
-out
-%>
-<% end -%>
+includedir /etc/munin/munin-conf.d