From 96cba5f82f4a6e2a65123022afb7e962313cbaed Mon Sep 17 00:00:00 2001 From: Zach Wolfenbarger Date: Wed, 11 Sep 2024 18:10:53 -0500 Subject: [PATCH 1/2] Revert /about and /get-involved to content-pages app --- nginx-fem-redirects.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nginx-fem-redirects.conf b/nginx-fem-redirects.conf index bdfc874..e56116d 100644 --- a/nginx-fem-redirects.conf +++ b/nginx-fem-redirects.conf @@ -1,6 +1,8 @@ set $fe_project_uri "https://fe-project.zooniverse.org"; +set $fe_content_pages_uri "https://fe-content-pages.zooniverse.org"; set $fe_root_uri "https://fe-root.zooniverse.org"; 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"; # Project app data and static files @@ -24,8 +26,8 @@ location ~* ^/(?:_next|assets)/.+?$ { # Zooniverse About pages, prefix match location /about { resolver 1.1.1.1; - proxy_pass $fe_root_uri; - proxy_set_header Host $fe_root_host; + proxy_pass $fe_content_pages_uri; + proxy_set_header Host $fe_content_pages_host; include /etc/nginx/proxy-security-headers.conf; } @@ -33,8 +35,8 @@ location /about { # Zooniverse Get Involved pages, prefix match location /get-involved { resolver 1.1.1.1; - proxy_pass $fe_root_uri; - proxy_set_header Host $fe_root_host; + proxy_pass $fe_content_pages_uri; + proxy_set_header Host $fe_content_pages_host; include /etc/nginx/proxy-security-headers.conf; } From 3b22b0aa4de2f8a8b6f5a23ce9918fcb99d393bd Mon Sep 17 00:00:00 2001 From: Zach Wolfenbarger Date: Wed, 11 Sep 2024 18:17:24 -0500 Subject: [PATCH 2/2] also for staging --- nginx-fem-staging-redirects.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nginx-fem-staging-redirects.conf b/nginx-fem-staging-redirects.conf index be573c1..e327069 100644 --- a/nginx-fem-staging-redirects.conf +++ b/nginx-fem-staging-redirects.conf @@ -1,6 +1,8 @@ set $fe_project_uri "https://fe-project.preview.zooniverse.org"; +set $fe_content_pages_uri "https://fe-content-pages.preview.zooniverse.org"; set $fe_root_uri "https://fe-root.preview.zooniverse.org"; 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"; # Project app data and static files @@ -24,8 +26,8 @@ location ~* ^/(?:_next|assets)/.+?$ { # Zooniverse About pages location /about { resolver 1.1.1.1; - proxy_pass $fe_root_uri; - proxy_set_header Host $fe_root_host; + proxy_pass $fe_content_pages_uri; + proxy_set_header Host $fe_content_pages_host; include /etc/nginx/proxy-security-headers.conf; } @@ -33,8 +35,8 @@ location /about { # Zooniverse Get Involved pages location /get-involved { resolver 1.1.1.1; - proxy_pass $fe_root_uri; - proxy_set_header Host $fe_root_host; + proxy_pass $fe_content_pages_uri; + proxy_set_header Host $fe_content_pages_host; include /etc/nginx/proxy-security-headers.conf; }