From cea5cdfae9af80512bca2db57369af7008bcc856 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Sat, 9 Nov 2019 01:18:10 +0100
Subject: [PATCH] Make fpm status and fpm ping be less keywordy

---
 Dockerfile             | 4 ++--
 php+nginx/NginxDefault | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03bffb0..a99314c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,8 +130,8 @@ RUN apt-get -qq update && \
     sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default && \
     sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/service/php-fpm/run && \
     # Enable PHP-FPM status & PHP-FPM ping
-    sed -i -e "s|;pm.status_path =.*|pm.status_path = /status|g" /etc/php/*/fpm/pool.d/www.conf && \
-    sed -i -e "s|;ping.path =.*|ping.path = /ping|g" /etc/php/*/fpm/pool.d/www.conf && \
+    sed -i -e "s|;pm.status_path =.*|pm.status_path = /fpm-status|g" /etc/php/*/fpm/pool.d/www.conf && \
+    sed -i -e "s|;ping.path =.*|ping.path = /fpm-ping|g" /etc/php/*/fpm/pool.d/www.conf && \
     # Using environment variables in config files works, it would seem. Neat!
     sed -i -e "s|pm.max_children = 5|pm.max_children = \${PHPFPM_MAX_CHILDREN}|g" /etc/php/*/fpm/pool.d/www.conf && \
     # Disable daemonising in nginx
diff --git a/php+nginx/NginxDefault b/php+nginx/NginxDefault
index a8dba00..74751b5 100644
--- a/php+nginx/NginxDefault
+++ b/php+nginx/NginxDefault
@@ -17,7 +17,7 @@ server {
         }
 
         # Pass thru status and ping requests to PHP-FPM
-        location = /status {
+        location = /fpm-status {
                 access_log off;
                 allow 127.0.0.1;
                 allow 10.0.0.0/8;
@@ -30,7 +30,7 @@ server {
                 include fastcgi_params;
         }
 
-        location = /ping {
+        location = /fpm-ping {
                 access_log off;
                 allow 127.0.0.1;
                 allow 10.0.0.0/8;