some munin upgrades for squeeze

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/munin-node/templates/munin-node.conf.erb b/modules/munin-node/templates/munin-node.conf.erb
index 231b1a25a0350f9a06fb8a4296979f9c81a39963..8f55bf892b3a19f721177fd18097b1f7af50fdee 100644 (file)
--- a/modules/munin-node/templates/munin-node.conf.erb
+++ b/modules/munin-node/templates/munin-node.conf.erb
@@ -12,7 +12,7 @@ log_file /var/log/munin/munin-node.log
 port 4949
 pid_file /var/run/munin/munin-node.pid
 background 1
-setseid 1
+setsid 1
 
 # Which port to bind to;
 host *

diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb
index b7f4767fc250167ae791dd06c14f7318b2151b64..6e9b78368962c3405ac28b02089d6d1537a4be76 100644 (file)
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -62,6 +62,11 @@ user root
 user root
 env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
 
+[df*]
+env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs
+env.warning 92
+env.critical 98
+
 <%=
 out = ""
 if has_variable?("mta") and mta == "postfix"