X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin-node.plugin.conf.erb;h=07923e29ed7b458869734ef76a9a0e821a106c81;hb=fd26356c64527a14c8aeffa7195947c9f41016f4;hp=ac02b0eea0302adf386e1ca76e4523f50fdae0cc;hpb=90d7596ee685a019f28e1af474c52b121ca37161;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/templates/munin-node.plugin.conf.erb b/modules/munin/templates/munin-node.plugin.conf.erb
index ac02b0eea..07923e29e 100644
--- a/modules/munin/templates/munin-node.plugin.conf.erb
+++ b/modules/munin/templates/munin-node.plugin.conf.erb
@@ -19,7 +19,7 @@ group adm, maillog
 user root
 <%=
 out = ""
-if has_variable?("mta") and mta == "exim4"
+if has_variable?("mta") and @mta == "exim4"
   out="
 [exim_mail*]
 user Debian-exim
@@ -63,7 +63,7 @@ env.critical 98
 
 <%=
 out = ""
-if has_variable?("mta") and mta == "postfix"
+if has_variable?("mta") and @mta == "postfix"
   out="
 [postfix_mailqueue]
 user postfix
@@ -90,7 +90,7 @@ group maillog
 [bind*]
 group bind
 <%=
-out = case hostname
+out = case @hostname
   when "geo1","geo2","geo3" then "env.logfile /var/log/bind9/geoip-query.log"
   else "env.logfile /var/log/bind9/named-query.log"
 end
@@ -101,8 +101,6 @@ out
 [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
+# filter out all the short-lived filesystems for df*:
 [df*]
-env.exclude devfs fdescfs linprocfs sysfs noprocfs linsysfs nfs nullfs
-<% end %>
+env.exclude_re ^/dev$ ^/run/.*$ ^/srv/piuparts-workspace/tmp.*$ ^/sys/.*$ ^/var/lib/schroot/mount/.*$