munin.conf in rubber-1.5.6

- old
+ new
@@ -1,39 +1,73 @@
 <%
   @path = '/etc/munin/munin.conf'
-  @post = "mkdir -p /var/www/munin; chown -R munin:munin /var/www/munin"
 %>
 
 # Example configuration file for Munin, generated by 'make build'
 
 # The next three variables specifies where the location of the RRD
-# databases, the HTML output, and the logs, severally.  They all
-# must be writable by the user running munin-cron.
-dbdir /var/lib/munin
-htmldir /var/www/munin
-logdir  /var/log/munin
+# databases, the HTML output, logs and the lock/pid files.  They all
+# must be writable by the user running munin-cron.  They are all
+# defaulted to the values you see here.
+#
+dbdir	/var/lib/munin
+htmldir /var/cache/munin/www
+logdir /var/log/munin
 rundir  /var/run/munin
 
 # Where to look for the HTML templates
 tmpldir /etc/munin/templates
 
+# (Exactly one) directory to include all files from.
+#
+includedir /etc/munin/munin-conf.d
+
 # Make graphs show values per minute instead of per second
 #graph_period minute
 
+# Graphics files are normaly generated by munin-graph, no matter if
+# the graphs are used or not.  You can change this to
+# on-demand-graphing by following the instructions in
+# http://munin.projects.linpro.no/wiki/CgiHowto
+#
+#graph_strategy cgi
+
+# munin-cgi-graph is invoked by the web server up to very many times at the
+# same time.  This is not optimal since it results in high CPU and memory
+# consumption to the degree that the system can thrash.  Again the default is
+# 6.  Most likely the optimal number for max_cgi_graph_jobs is the same as
+# max_graph_jobs.
+#
+#munin_cgi_graph_jobs 6
+
+# If the automatic CGI url is wrong for your system override it here:
+#
+#cgiurl_graph /cgi-bin/munin-cgi-graph
+
+# munin-graph runs in parallel, the number of concurrent processes is
+# 6.  If you want munin-graph to not be parallel set to 0.  If set too
+# high it will slow down munin-graph.  Some experiments are needed to
+# determine how many are optimal on your system.  On a multi-core
+# system with good SCSI disks the number can probably be quite high.
+#
+#max_graph_jobs 6
+
 # Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime
 # something changes (OK -> WARNING, CRITICAL -> OK, etc)
 #contact.someuser.command mail -s "Munin notification" somejuser@fnord.comm
 #contact.anotheruser.command mail -s "Munin notification" anotheruser@blibb.comm
 #
-# For those with Nagios, the following might come in handy. In addition,
-# the services must be defined in the Nagios server as well.
-#contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 contacts dev
 contact.dev.command mail -s "Munin notification ${var:host} : ${var:group}" <%= rubber_env.admin_email %>
 contact.dev.always_send warning critical
 
+# For those with Nagios, the following might come in handy. In addition,
+# the services must be defined in the Nagios server as well.
+#contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
 
+# The host tree generated by rubber
+#
 <% rubber_instances.each do |i| %>
 [<%= i.full_name %>]
   address <%= i.internal_ip %>
   use_node_name yes
 <% end %>