add rietz back into munin

[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..b7f4767 100644 (file)
--- a/modules/munin-node/templates/munin-node.plugin.conf.erb
+++ b/modules/munin-node/templates/munin-node.plugin.conf.erb
@@ -55,6 +55,9 @@ user nobody
 [ip_*]
 user root
 
+[ip6_*]
+user root
+
 [mysql*]
 user root
 env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
@@ -86,11 +89,11 @@ user root
 group maillog
 
 [bind*]
+group bind
 <%=
 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
 %>