X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=6e9b78368962c3405ac28b02089d6d1537a4be76;hb=e95028666f1ef429d608c1c70539637f4861d032;hp=4f3d3ed979dfb72e5434fde900d65641599e3868;hpb=d87b074c2655e948b387162b5834958a53e24492;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 4f3d3ed97..6e9b78368 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 and 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 and mta == "postfix"
+if has_variable?("mta") and mta == "postfix"
   out="
 [postfix_mailqueue]
 user postfix
@@ -77,11 +94,11 @@ user root
 group maillog
 
 [bind*]
+group bind
 <%=
 out = case hostname
-  when "geo1","geo2","geo3" then "group bind
-env.logfile /var/log/bind9/geoip-query.log"
-  else "group adm"
+  when "geo1","geo2","geo3" then "env.logfile /var/log/bind9/geoip-query.log"
+  else "env.logfile /var/log/bind9/named-query.log"
 end
 out
 %>