X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=73ffb46213fcc65116df46ad33c10a2256daddd6;hb=9cb0abcfdfa920a685dcb7e19f41a6587588cb88;hp=a3a88126ec27127b696f11dfc3812ee6ade36264;hpb=ea3ffe6b7b2e565640a97cd966d7d21e167ba4e9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb
index a3a88126e..73ffb4621 100644
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -19,7 +19,7 @@ group adm, maillog
 user root
 <%=
 out = ""
-if mta == "exim4"
+if has_variable?("mta") and mta == "exim4"
   out="
 [exim_mail*]
 user Debian-exim
@@ -27,7 +27,16 @@ group maillog"
 end
 out
 %>
-
+<%=
+out = ""
+if has_variable?("vsftpd") and vsftpd == "true"
+  out="
+[vsftpd]
+user root
+"
+end
+out
+%>
 [fw_conntrack]
 user root
 
@@ -46,13 +55,21 @@ user nobody
 [ip_*]
 user root
 
+[ip6_*]
+user root
+
 [mysql*]
 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 mta == "postfix"
+if has_variable?("mta") and mta == "postfix"
   out="
 [postfix_mailqueue]
 user postfix
@@ -76,10 +93,16 @@ user root
 [spamassassin]
 group maillog
 
-[bind]
+[bind*]
+group bind
 <%=
 out = case hostname
-  when geo1,geo2,geo3 then "env.logfile=/var/log/bind9/geoip-query.log"
+  when "geo1","geo2","geo3" then "env.logfile /var/log/bind9/geoip-query.log"
+  else "env.logfile /var/log/bind9/named-query.log"
 end
 out
 %>
+
+# filter out all the short-lived sbuild/schroot filesystems for diskstats:
+[diskstats]
+env.exclude sbuild,schroot