From ffe9cd06fb73180aaab286a32fc36978f95b7056 Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Thu, 6 May 2021 20:32:11 +0100
Subject: [PATCH] Ensure the SCRIPT_NAME value is correctly set

This seems to be the root cause of missing URLs somehow morphing into
redirects.
---
 data/nginx/fastcgi-script.conf | 4 ++++
 data/nginx/fastcgi.conf        | 4 +++-
 data/nginx/server.conf         | 7 ++-----
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 data/nginx/fastcgi-script.conf

diff --git a/data/nginx/fastcgi-script.conf b/data/nginx/fastcgi-script.conf
new file mode 100644
index 0000000..5943224
--- /dev/null
+++ b/data/nginx/fastcgi-script.conf
@@ -0,0 +1,4 @@
+include fastcgi.conf;
+
+fastcgi_param  SCRIPT_FILENAME    /app$fastcgi_script_name;
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
diff --git a/data/nginx/fastcgi.conf b/data/nginx/fastcgi.conf
index 321efe2..2a6f9b0 100644
--- a/data/nginx/fastcgi.conf
+++ b/data/nginx/fastcgi.conf
@@ -1,11 +1,13 @@
 fastcgi_pass upstream:9000;
 
+fastcgi_param  SCRIPT_FILENAME    /app/index.php;
+fastcgi_param  SCRIPT_NAME        index.php;
+
 fastcgi_param  QUERY_STRING       $query_string;
 fastcgi_param  REQUEST_METHOD     $request_method;
 fastcgi_param  CONTENT_TYPE       $content_type;
 fastcgi_param  CONTENT_LENGTH     $content_length;
 
-fastcgi_param  SCRIPT_FILENAME    /app$fastcgi_script_name;
 fastcgi_param  REQUEST_URI        $request_uri;
 fastcgi_param  DOCUMENT_URI       $document_uri;
 fastcgi_param  DOCUMENT_ROOT      /app;
diff --git a/data/nginx/server.conf b/data/nginx/server.conf
index 8747d2f..2e83d75 100644
--- a/data/nginx/server.conf
+++ b/data/nginx/server.conf
@@ -33,7 +33,6 @@ server {
 
 	location @not-found {
 		include fastcgi.conf;
-		fastcgi_param SCRIPT_FILENAME /app/index.php;
 		fastcgi_cache ERR;
 		fastcgi_cache_valid 404 1d;
 	}
@@ -41,7 +40,6 @@ server {
 	location @index {
 		include fastcgi.conf;
 		include cache-bust.conf;
-		fastcgi_param SCRIPT_FILENAME /app/index.php;
 	}
 
 	location = /.probe {
@@ -66,7 +64,6 @@ server {
 	location /wp-json/ {
 		include fastcgi.conf;
 		include cache-bust.conf;
-		fastcgi_param SCRIPT_FILENAME /app/index.php;
 	}
 
 	# use /index.php as a front controller if the base of the URI path does
@@ -76,7 +73,7 @@ server {
 	}
 
 	location = /wp-login.php {
-		include fastcgi.conf;
+		include fastcgi-script.conf;
 		include cache-bust.conf;
 	}
 
@@ -88,7 +85,7 @@ server {
 		try_files $uri $uri/index.php;
 
 		location ~ \.php$ {
-			include fastcgi.conf;
+			include fastcgi-script.conf;
 			include cache-bust.conf;
 		}
 	}
-- 
GitLab