summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2020-05-26 21:15:18 +0200
committerGuilhem Moulin <guilhem@fripost.org>2020-05-26 21:26:45 +0200
commita37de918998af826ae38a1575bacef87c0bf902d (patch)
treed99b593ebb54da34c1035458bce9fa5398eac57d
parent0dfaad0c54e44f1abef691d6b98d7b8db807027d (diff)
munin: `sed s,/var/run/,/run,`
-rw-r--r--roles/munin-master/tasks/main.yml2
-rw-r--r--roles/munin-master/templates/etc/munin/munin.conf.j24
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/munin-master/tasks/main.yml b/roles/munin-master/tasks/main.yml
index 9ed3577..aa22ac6 100644
--- a/roles/munin-master/tasks/main.yml
+++ b/roles/munin-master/tasks/main.yml
@@ -9,7 +9,7 @@
- name: Configure rrdcached
lineinfile: "dest=/etc/default/rrdcached
regexp='^#?OPTS='
- line='OPTS=\"-s munin -m 660 -l unix:/var/run/rrdcached.sock -w 1800 -z 1800 -f 3600 -j /var/lib/rrdcached/journal -F -b /var/lib/munin -B\"'"
+ line='OPTS=\"-s munin -m 660 -l unix:/run/rrdcached.sock -w 1800 -z 1800 -f 3600 -j /var/lib/rrdcached/journal -F -b /var/lib/munin -B\"'"
register: r
notify:
- Restart rrdcached
diff --git a/roles/munin-master/templates/etc/munin/munin.conf.j2 b/roles/munin-master/templates/etc/munin/munin.conf.j2
index 401094a..b53ef0e 100644
--- a/roles/munin-master/templates/etc/munin/munin.conf.j2
+++ b/roles/munin-master/templates/etc/munin/munin.conf.j2
@@ -8,7 +8,7 @@
#dbdir /var/lib/munin
#htmldir /var/cache/munin/www
#logdir /var/log/munin
-#rundir /var/run/munin
+#rundir /run/munin
# Where to look for the HTML templates
#
@@ -83,7 +83,7 @@ html_strategy cgi
# To reduce IO and enable the use of the rrdcached, uncomment it and set it to
# the location of the socket that rrdcached uses.
#
-rrdcached_socket /var/run/rrdcached.sock
+rrdcached_socket /run/rrdcached.sock
# Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime
# something changes (OK -> WARNING, CRITICAL -> OK, etc)