projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[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
1790558
..
fbf1539
100644
(file)
--- 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