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 git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[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
b5012f7
..
6e9b783
100644
(file)
--- a/
modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/
modules/munin-node/templates/munin-node.plugin.conf.erb
@@
-55,10
+55,18
@@
user nobody
[ip_*]
user root
[ip_*]
user root
+[ip6_*]
+user root
+
[mysql*]
user root
env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
[mysql*]
user root
env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
+[df*]
+env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs
+env.warning 92
+env.critical 98
+
<%=
out = ""
if has_variable?("mta") and mta == "postfix"
<%=
out = ""
if has_variable?("mta") and mta == "postfix"
@@
-86,11
+94,11
@@
user root
group maillog
[bind*]
group maillog
[bind*]
+group bind
<%=
out = case hostname
<%=
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
%>
end
out
%>