Redeploy fe-root for /about and /get-involved pages

zooniverse · Sep 12, 2024 · d0e8e4c · d0e8e4c
1 parent 0dc1fd3
commit d0e8e4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 48 deletions.
diff --git a/nginx-fem-redirects.conf b/nginx-fem-redirects.conf
@@ -5,24 +5,6 @@ set $fe_project_host "fe-project.zooniverse.org";
 set $fe_content_pages_host "fe-content-pages.zooniverse.org";
 set $fe_root_host "fe-root.zooniverse.org";
 
-# Mock route to test per-path query param caching
-location /mock {
-    resolver 1.1.1.1;
-    proxy_pass $fe_root_uri;
-    proxy_set_header Host $fe_root_host;
-
-    include /etc/nginx/proxy-security-headers.conf;
-}
-
-# Mock route, fe-root app data and static files
-location ~* ^/mock/(?:_next|assets)/.+?$ {
-    resolver 1.1.1.1;
-    proxy_pass $fe_root_uri;
-    proxy_set_header Host $fe_root_host;
-
-    include /etc/nginx/proxy-security-headers.conf;
-}
-
 # Project app data and static files
 location ~* ^/projects/(?:_next|assets)/.+?$ {
     resolver 1.1.1.1;
@@ -35,26 +17,26 @@ location ~* ^/projects/(?:_next|assets)/.+?$ {
 # Root app data and static files
 location ~* ^/(?:_next|assets)/.+?$ {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
 # Zooniverse About pages, prefix match
 location /about {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
 # Zooniverse Get Involved pages, prefix match
 location /get-involved {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }

diff --git a/nginx-fem-staging-redirects.conf b/nginx-fem-staging-redirects.conf
@@ -5,24 +5,6 @@ set $fe_project_host "fe-project.preview.zooniverse.org";
 set $fe_content_pages_host "fe-content-pages.preview.zooniverse.org";
 set $fe_root_host "fe-root.preview.zooniverse.org";
 
-# Mock route to test per-path query param caching
-location  /mock {
-    resolver 1.1.1.1;
-    proxy_pass $fe_root_uri;
-    proxy_set_header Host $fe_root_host;
-
-    include /etc/nginx/proxy-security-headers.conf;
-}
-
-# Mock route, fe-root app data and static files
-location ~* ^/mock/(?:_next|assets)/.+?$ {
-    resolver 1.1.1.1;
-    proxy_pass $fe_root_uri;
-    proxy_set_header Host $fe_root_host;
-
-    include /etc/nginx/proxy-security-headers.conf;
-}
-
 # Project app data and static files
 location ~* ^/projects/(?:_next|assets)/.+?$ {
     resolver 1.1.1.1;
@@ -35,26 +17,26 @@ location ~* ^/projects/(?:_next|assets)/.+?$ {
 # Root app data and static files
 location ~* ^/(?:_next|assets)/.+?$ {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
 # Zooniverse About pages
 location /about {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }
 
 # Zooniverse Get Involved pages
 location /get-involved {
     resolver 1.1.1.1;
-    proxy_pass $fe_content_pages_uri;
-    proxy_set_header Host $fe_content_pages_host;
+    proxy_pass $fe_root_uri;
+    proxy_set_header Host $fe_root_host;
 
     include /etc/nginx/proxy-security-headers.conf;
 }