Commit 23fa984d authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch '14-incorrect-301-redirect-to-homepage-when-404-would-be-expected' into 'develop' 

Resolve "Incorrect 301 redirect to homepage when 404 would be expected"

See merge request !16
parents 5da02083 ffe9cd06

data/nginx/fastcgi-script.conf

0 → 100644
+4 −0
Original line number Diff line number Diff line 
include fastcgi.conf;



fastcgi_param  SCRIPT_FILENAME    /app$fastcgi_script_name;

fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;

data/nginx/fastcgi.conf

+3 −1
Original line number Diff line number Diff line 
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;

data/nginx/server.conf

+2 −5
Original line number Diff line number Diff line
@@ -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;

	}
@@ -84,7 +81,7 @@ server { 
		try_files $uri $uri/index.php;



		location ~ \.php$ {

			include fastcgi.conf;

			include fastcgi-script.conf;

			include cache-bust.conf;

		}

	}