Skip to content

Commit

Permalink
Merge pull request #367 from zooniverse/temp-content-pages-revert
Browse files Browse the repository at this point in the history
Revert /about and /get-involved to content-pages app
  • Loading branch information
zwolf authored Sep 11, 2024
2 parents c21a3d6 + 3b22b0a commit 7d040a7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
10 changes: 6 additions & 4 deletions nginx-fem-redirects.conf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,17 +26,17 @@ 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;
}

# 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;
}
Expand Down
10 changes: 6 additions & 4 deletions nginx-fem-staging-redirects.conf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,17 +26,17 @@ 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;
}

# 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;
}
Expand Down

0 comments on commit 7d040a7

Please sign in to comment.