X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=fd3acbe78ba2e411383e836b4f5a9cc8ca6b253e;hb=61b06c897b8b1414469f56eea0644477a5dd2c26;hp=06f61714ee257fca91893f417a5522dd409bc81d;hpb=798b2d47e3a2e35962e581d81d3072ee5020ff74;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 06f61714e..fd3acbe78 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
 
@@ -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
@@ -77,11 +86,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
 %>