2 files changed, 8 insertions, 6 deletions
diff --git a/roles/common/templates/etc/munin/munin-node.conf.j2 b/roles/common/templates/etc/munin/munin-node.conf.j2
index de4098a..1aba053 100644
--- a/roles/common/templates/etc/munin/munin-node.conf.j2
+++ b/roles/common/templates/etc/munin/munin-node.conf.j2
@@ -1,51 +1,52 @@
 #
 # Example config-file for munin-node
 #
 
 log_level 4
 log_file /var/log/munin/munin-node.log
-pid_file /var/run/munin/munin-node.pid
+pid_file /run/munin/munin-node.pid
 
 background 1
 setsid 1
 
 user root
 group root
 
 # This is the timeout for the whole transaction.
 # Units are in sec. Default is 15 min
 #
 # global_timeout 900
 
 # This is the timeout for each plugin.
 # Units are in sec. Default is 1 min
 #
 # timeout 60
 
 # Regexps for files to ignore
 ignore_file [\#~]$
 ignore_file DEADJOE$
 ignore_file \.bak$
 ignore_file %$
 ignore_file \.dpkg-(tmp|new|old|dist)$
 ignore_file \.rpm(save|new)$
 ignore_file \.pod$
 
 # Set this if the client doesn't report the correct hostname when
-# telnetting to localhost, port 4949
+# telnetting to {{ ipsec[inventory_hostname_short] }}, port 4949
 #
 host_name {{ inventory_hostname_short }}
 
 # A list of addresses that are allowed to connect.  This must be a
 # regular expression, since Net::Server does not understand CIDR-style
 # network notation unless the perl module Net::CIDR is installed.  You
 # may repeat the allow line as many times as you'd like
 
-allow ^127\.0\.0\.1$
-allow ^::1$
+{% for host in groups['munin_master'] %}
+allow ^{{ ipsec[ hostvars[host].inventory_hostname_short ] | ansible.utils.ipv4 | replace(".","\.") }}$
+{% endfor %}
 
 # Which address to bind to;
-host 127.0.0.1
+host {{ ipsec[inventory_hostname_short] }}
 
 # And which port
 port 4994
diff --git a/roles/common/templates/etc/munin/plugin-conf.d/munin-node.j2 b/roles/common/templates/etc/munin/plugin-conf.d/munin-node.j2
index 6cfa3f9..ec471eb 100644
--- a/roles/common/templates/etc/munin/plugin-conf.d/munin-node.j2
+++ b/roles/common/templates/etc/munin/plugin-conf.d/munin-node.j2
@@ -19,77 +19,78 @@ env.MUNIN_MKTEMP /bin/mktemp -p /tmp/ $1
 env.amavislog /var/log/mail.info
 
 [apt]
 user root
 
 [courier_mta_mailqueue]
 group daemon
 
 [courier_mta_mailstats]
 group adm
 
 [courier_mta_mailvolume]
 group adm
 
 [cps*]
 user root
 
 [df*]
 env.warning 92
 env.critical 98
+env.exclude_re ^/run/user
 
 [exim_mailqueue]
 group adm, (Debian-exim)
 
 [exim_mailstats]
 group adm, (Debian-exim)
 env.logdir /var/log/exim4/
 env.logname mainlog
 
 [fw_conntrack]
 user root
 
 [fw_forwarded_local]
 user root
 
 [hddtemp_smartctl]
 user root
 
 [hddtemp2]
 user root
 
 [if_*]
 user root
 
 [if_err_*]
 user nobody
 
 [ip_*]
 user root
 
 [ipmi_*]
 user root
 
 [mysql*]
 user root
 env.mysqlopts --defaults-file=/etc/mysql/debian.cnf
-env.mysqluser debian-sys-maint
+env.mysqluser root
 env.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf
 
 [postfix_mailqueue_*]
 user postfix
 
 [postfix_stats_*]
 group adm
 
 [postfix_sasl_*]
 group adm
 
 [postfix_mailvolume2]
 group adm
 env.postmulti postfix{% for g in postfix_instance.keys() | sort %}{% if g in group_names %} postfix-{{ postfix_instance[g].name }}{% endif %}{% endfor %}
 
 
 [dovecot_logins]
 group adm
 
 [dovecot_stats_*]