From: Stephen Gran <steve@lobefin.net>
Date: Sun, 13 Feb 2011 20:27:06 +0000 (+0000)
Subject: some munin upgrades for squeeze
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9d399027c5b7a0f0255a8d37992b9631f6d91a80;p=mirror%2Fdsa-puppet.git

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 231b1a25a..8f55bf892 100644
--- 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 b7f4767fc..6e9b78368 100644
--- 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"