Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

[mirror/dsa-puppet.git] / modules / munin-node / templates / munin-node.plugin.conf.erb

diff --git a/modules/munin-node/templates/munin-node.plugin.conf.erb b/modules/munin-node/templates/munin-node.plugin.conf.erb
index 9ed7097..b5012f7 100644 (file)
--- 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
 
@@ -52,7 +61,7 @@ env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
 
 <%=
 out = ""
-if mta == "postfix"
+if has_variable?("mta") and mta == "postfix"
   out="
 [postfix_mailqueue]
 user postfix
@@ -76,10 +85,12 @@ user root
 [spamassassin]
 group maillog
 
-[bind]
+[bind*]
 <%=
-out = case node
-  when geo1,geo2,geo3 then "env.logfile=/var/log/bind9/geoip-query.log"
+out = case hostname
+  when "geo1","geo2","geo3" then "group bind
+env.logfile /var/log/bind9/geoip-query.log"
+  else "group adm"
 end
 out
 %>