evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 32 Wiki Activity

nginx: Do not use spawn-fcgi for munin-graph #139

Open
mtrossevin wants to merge 1 commit from mtrossevin/ansible-roles:nginx-munin-no-spawn-fcgi into unstable
pull from: mtrossevin/ansible-roles:nginx-munin-no-spawn-fcgi
merge into: evolix:unstable
Conversation 1 Commits 1 Files changed 5 +36 -13
5 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -25,6 +25,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
* mongodb: Deny the install on Debian 11 « Bullseye » when the version is unsupported
* mongodb: Support version 5.0 (for buster)
* mongodb: Allow to specify a mongodb version for buster & bullseye
* nginx: no longer use spawn-fcgi for munin zoom (instead use a systemd socket file + service)
### Fixed

15
nginx/files/systemd/fcgi-munin-graph.service Normal file
View file

@ -0,0 +1,15 @@
[Unit]
Description=Munin zoom for nginx.
After=network.target
Requires=fcgi-munin-graph.socket
[Service]
User=munin
Group=munin
ExecStart=/usr/lib/munin/cgi/munin-cgi-graph
StandardInput=socket
StandardOutput=null
StandardError=journal
[Install]
WantedBy=multi-user.target
mtrossevin commented 2021-11-17 13:54:51 +01:00
Review
Copy link

This allow the service to be started on boot instead of waiting for the first connexion on the socket if wanted.

This allow the service to be started on boot instead of waiting for the first connexion on the socket if wanted.

12
nginx/files/systemd/fcgi-munin-graph.socket Normal file
View file

@ -0,0 +1,12 @@
[Unit]
Description=Socket for Munin zoom
[Socket]
SocketUser=www-data
SocketGroup=www-data
SocketMode=0600
ListenStream=/run/munin/spawn-fcgi-munin-graph.sock
Accept=no
[Install]
WantedBy=sockets.target

10
nginx/files/systemd/spawn-fcgi-munin-graph.service
View file

@ -1,10 +0,0 @@
[Unit]
Description=Munin zoom for nginx.
After=network.target
[Service]
ExecStart=/usr/bin/spawn-fcgi -s /var/run/munin/spawn-fcgi-munin-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph
Type=forking
[Install]
WantedBy=default.target

11
nginx/tasks/munin_vhost.yml
View file

@ -28,14 +28,19 @@
args:
warn: no
- name: Systemd socket unit for Munin-fcgi is installed
copy:
src: systemd/fcgi-munin-graph.socket
dest: /etc/systemd/system/fcgi-munin-graph.socket
- name: Systemd unit for Munin-fcgi is installed
copy:
src: systemd/spawn-fcgi-munin-graph.service
dest: /etc/systemd/system/spawn-fcgi-munin-graph.service
src: systemd/fcgi-munin-graph.service
dest: /etc/systemd/system/fcgi-munin-graph.service
- name: Systemd unit for Munin-fcgi is started
jlecour commented 2022-06-06 18:22:45 +02:00
Review
Copy link

I guess we should change the name to Systemd socket for Munin-fcgi is installed to mention the socket instead of the service.

I guess we should change the name to `Systemd socket for Munin-fcgi is installed` to mention the socket instead of the service.
systemd:
name: spawn-fcgi-munin-graph
name: fcgi-munin-graph.socket
daemon_reload: yes
enabled: yes
state: started