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=04283cf24526fc3d66ec4da26991552d2d6391bb;hp=0a3f2c9aff10dbf0c15fc8ca73cba705a68440ff;hpb=13ea8372c42d1000f3fbf1ab3e3a8a0c41ff9690;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 0a3f2c9af..fd3acbe78 100644
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -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
 
@@ -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
 %>