From 1d56e002b42f856b6d094fb9e55d1ab325b2acdf Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 23 Dec 2020 15:53:36 +0100
Subject: [PATCH] nginx: change from "nginx_status-XXX" to "server-status-XXX"

---
 CHANGELOG.md                             | 2 ++
 nginx/tasks/server_status_write.yml      | 8 ++++----
 nginx/templates/evolinux-default.conf.j2 | 2 +-
 nginx/templates/munin/evolinux.nginx     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7a40bd..fb48c5d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/nginx/tasks/server_status_write.yml b/nginx/tasks/server_status_write.yml
index e0b069db..beb56c67 100644
--- a/nginx/tasks/server_status_write.yml
+++ b/nginx/tasks/server_status_write.yml
@@ -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
diff --git a/nginx/templates/evolinux-default.conf.j2 b/nginx/templates/evolinux-default.conf.j2
index 5662ba51..ab4f8803 100644
--- a/nginx/templates/evolinux-default.conf.j2
+++ b/nginx/templates/evolinux-default.conf.j2
@@ -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;
     }
diff --git a/nginx/templates/munin/evolinux.nginx b/nginx/templates/munin/evolinux.nginx
index f58c0078..f5633139 100644
--- a/nginx/templates/munin/evolinux.nginx
+++ b/nginx/templates/munin/evolinux.nginx
@@ -1,2 +1,2 @@
 [nginx_*]
-env.url http://munin/nginx_status-{{ nginx_serverstatus_suffix }}
+env.url http://munin/server-status-{{ nginx_serverstatus_suffix }}