X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=b5012f7dee29ccbaff49a3f1b0ccaa7c92747a0d;hb=fcbf04aea39b64665b78d2e48b7a38b5f6579514;hp=1790558534a00f56f916b41cf86e7ccd03cd0fd9;hpb=ebc172c3457205748062b714f8f82750940ebf34;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 179055853..b5012f7de 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
 
@@ -79,7 +88,7 @@ group maillog
 [bind*]
 <%=
 out = case hostname
-  when "geo1","geo2","geo3","raff" then "group bind
+  when "geo1","geo2","geo3" then "group bind
 env.logfile /var/log/bind9/geoip-query.log"
   else "group adm"
 end