CDPT-2264 Improve nginx's file serving.

Previously a missing file caused an error. Now it's a 404 without an error.
ministryofjustice · Nov 20, 2024 · 51610aa · 51610aa
1 parent 85022da
commit 51610aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/deploy/config/local/nginx/server.conf b/deploy/config/local/nginx/server.conf
@@ -71,8 +71,14 @@ server {
 
     # Empty location blocks to allow access when "/" location
     # sends an HTTP 503 during maintenance mode
-    location /app/themes/clarity/error-pages/ { }
-    location /app/themes/clarity/dist/ { }
+    location /app/themes/clarity/error-pages/ {
+        # If the file exists, serve it directly, else return 404.
+        try_files $uri =404;
+    }
+    location /app/themes/clarity/dist/ {
+        # If the file exists, serve it directly, else return 404.
+        try_files $uri =404;
+    }
 
     # Rewrite old upload URLs to the bedrock equivalent
     location /wp-content/uploads/ {

diff --git a/deploy/config/server.conf b/deploy/config/server.conf
@@ -90,8 +90,14 @@ server {
 
     # Empty location blocks to allow access when "/" location
     # sends an HTTP 503 during maintenance mode
-    location /app/themes/clarity/error-pages/ { }
-    location /app/themes/clarity/dist/ { }
+    location /app/themes/clarity/error-pages/ {
+        # If the file exists, serve it directly, else return 404.
+        try_files $uri =404;
+    }
+    location /app/themes/clarity/dist/ {
+        # If the file exists, serve it directly, else return 404.
+        try_files $uri =404;
+    }
 
     # Rewrite old upload URLs to the bedrock equivalent
     location /wp-content/uploads/ {