summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2020-11-02 01:21:18 +0100
committerGuilhem Moulin <guilhem@fripost.org>2020-11-02 01:21:18 +0100
commit42b23f9104f3aa44bfe04bf9b0ee40a2d369db99 (patch)
treed7600416492c28249b3273333e346e3e8acf78e7 /roles
parent078ccb09d1192a879a6dd47b3ec483717ee1c327 (diff)
Munin master: Bug fix for the HTML rendering.
Diffstat (limited to 'roles')
-rw-r--r--roles/munin-master/files/etc/nginx/sites-available/munin4
-rw-r--r--roles/munin-master/tasks/main.yml11
2 files changed, 11 insertions, 4 deletions
diff --git a/roles/munin-master/files/etc/nginx/sites-available/munin b/roles/munin-master/files/etc/nginx/sites-available/munin
index 7b0b789..2f681fb 100644
--- a/roles/munin-master/files/etc/nginx/sites-available/munin
+++ b/roles/munin-master/files/etc/nginx/sites-available/munin
@@ -23,15 +23,15 @@ server {
location /munin-cgi/munin-cgi-graph/ {
fastcgi_split_path_info ^(/munin-cgi/munin-cgi-graph)(.*);
+ fastcgi_param PATH_INFO $fastcgi_path_info;
include snippets/fastcgi.conf;
fastcgi_pass unix:/run/munin/cgi-graph.socket;
- gzip off;
}
location /munin/ {
fastcgi_split_path_info ^(/munin)(.*);
+ fastcgi_param PATH_INFO $fastcgi_path_info;
include snippets/fastcgi.conf;
fastcgi_pass unix:/run/munin/cgi-html.socket;
- gzip off;
}
}
diff --git a/roles/munin-master/tasks/main.yml b/roles/munin-master/tasks/main.yml
index aa22ac6..6dad93b 100644
--- a/roles/munin-master/tasks/main.yml
+++ b/roles/munin-master/tasks/main.yml
@@ -8,8 +8,15 @@
- name: Configure rrdcached
lineinfile: "dest=/etc/default/rrdcached
- regexp='^#?OPTS='
- 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\"'"
+ regexp='^#?{{ item.name }}='
+ line='{{ item.name }}=\"{{ item.value }}\"'"
+ with_items:
+ - { name: 'BASE_OPTIONS', value: '-B -F' }
+ - { name: 'BASE_PATH', value: '/var/lib/munin' }
+ - { name: 'SOCKFILE', value: '/run/rrdcached.sock' }
+ - { name: 'SOCKGROUP', value: 'munin' }
+ - { name: 'SOCKMODE', value: '0660' }
+ - { name: 'WRITE_TIMEOUT', value: '1800' }
register: r
notify:
- Restart rrdcached