dupload.conf: enable gpg check

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

diff --git a/modules/munin/templates/munin-node.plugin.conf.erb b/modules/munin/templates/munin-node.plugin.conf.erb
index 73ffb46213fcc65116df46ad33c10a2256daddd6..ac02b0eea0302adf386e1ca76e4523f50fdae0cc 100644 (file)
--- a/modules/munin/templates/munin-node.plugin.conf.erb
+++ b/modules/munin/templates/munin-node.plugin.conf.erb
@@ -27,16 +27,10 @@ group maillog"
 end
 out
 %>
-<%=
-out = ""
-if has_variable?("vsftpd") and vsftpd == "true"
-  out="
+
 [vsftpd]
 user root
-"
-end
-out
-%>
+
 [fw_conntrack]
 user root
 
@@ -106,3 +100,9 @@ out
 # filter out all the short-lived sbuild/schroot filesystems for diskstats:
 [diskstats]
 env.exclude sbuild,schroot
+
+<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%>
+# Workaround for https://bugs.debian.org/767102
+[df*]
+env.exclude devfs fdescfs linprocfs sysfs noprocfs linsysfs nfs nullfs
+<% end %>