From d0e8e4c950e1d6a649be7346df81b505073000ee Mon Sep 17 00:00:00 2001 From: Zach Wolfenbarger Date: Thu, 12 Sep 2024 15:33:56 -0500 Subject: [PATCH] Redeploy fe-root for /about and /get-involved pages --- nginx-fem-redirects.conf | 30 ++++++------------------------ nginx-fem-staging-redirects.conf | 30 ++++++------------------------ 2 files changed, 12 insertions(+), 48 deletions(-) diff --git a/nginx-fem-redirects.conf b/nginx-fem-redirects.conf index 24aa393..ad9a4c5 100644 --- 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,8 +17,8 @@ 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; } @@ -44,8 +26,8 @@ location ~* ^/(?:_next|assets)/.+?$ { # 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; } @@ -53,8 +35,8 @@ location /about { # 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 index 0a22223..77dfa53 100644 --- 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,8 +17,8 @@ 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; } @@ -44,8 +26,8 @@ location ~* ^/(?:_next|assets)/.+?$ { # 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; } @@ -53,8 +35,8 @@ location /about { # 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; }