Browse Source

nginx: change from "nginx_status-XXX" to "server-status-XXX"

pull/121/head
Jérémy Lecour 3 weeks ago
committed by Jérémy Lecour
parent
commit
1d56e002b4
4 changed files with 8 additions and 6 deletions
  1. +2
    -0
      CHANGELOG.md
  2. +4
    -4
      nginx/tasks/server_status_write.yml
  3. +1
    -1
      nginx/templates/evolinux-default.conf.j2
  4. +1
    -1
      nginx/templates/munin/evolinux.nginx

+ 2
- 0
CHANGELOG.md View File

@ -16,6 +16,8 @@ The **patch** part changes incrementally at each release.
### Changed
* nginx: change from "nginx_status-XXX" to "server-status-XXX"
### Fixed
### Removed


+ 4
- 4
nginx/tasks/server_status_write.yml View File

@ -9,12 +9,12 @@
- name: add server-status suffix in default site index if missing
replace:
dest: /var/www/index.html
regexp: '"/nginx_status-?"'
replace: '"/nginx_status-{{ nginx_serverstatus_suffix }}"'
regexp: '"/server-status-?"'
replace: '"/server-status-{{ nginx_serverstatus_suffix }}"'
- name: add server-status suffix in default VHost
replace:
dest: /etc/nginx/sites-available/evolinux-default.conf
regexp: 'location /nginx_status-? {'
replace: 'location /nginx_status-{{ nginx_serverstatus_suffix }} {'
regexp: 'location /server-status-? {'
replace: 'location /server-status-{{ nginx_serverstatus_suffix }} {'
notify: reload nginx

+ 1
- 1
nginx/templates/evolinux-default.conf.j2 View File

@ -50,7 +50,7 @@ server {
listen 80;
server_name munin;
location /nginx_status-{{ nginx_serverstatus_suffix | mandatory }} {
location /server-status-{{ nginx_serverstatus_suffix | mandatory }} {
stub_status on;
access_log off;
}


+ 1
- 1
nginx/templates/munin/evolinux.nginx View File

@ -1,2 +1,2 @@
[nginx_*]
env.url http://munin/nginx_status-{{ nginx_serverstatus_suffix }}
env.url http://munin/server-status-{{ nginx_serverstatus_suffix }}

Loading…
Cancel
Save