-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Refactor FEM/PFE redirect confs * Update Dockerfile with new confs * static-staging to use fe-root * www.zooniverse.org.conf to default to fe-root app * Reroute frontend.preview * Re-add missing FEM project redirect * Include newest project redirect
- Loading branch information
Showing
7 changed files
with
180 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 0 additions & 41 deletions
41
nginx-fem-redirects.conf → nginx-fem-project-redirects.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| set $proxy_path "www.zooniverse.org"; | ||
|
|
||
| # FEM project assets | ||
| location ~* ^/projects/(?:_next|assets)/.+?$ { | ||
| resolver 1.1.1.1; | ||
| proxy_pass "https://fe-project.zooniverse.org"; | ||
| proxy_set_header Host fe-project.zooniverse.org; | ||
|
|
||
| include /etc/nginx/proxy-security-headers.conf; | ||
| } | ||
|
|
||
| # PFE assets | ||
| location ~ ^/[\w-]+\.(js|css)$ { | ||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path$request_uri; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # User profile page | ||
| location ~* ^/users/[\w-]+/?$ { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # User specific pages | ||
| location ~* ^/users/[\w-]+/((collections|favorites|message)?)/?$ { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # Default: /project/* to PFE | ||
| # Can be overridden by directives in nginx-project-redirects.conf | ||
| location ~* ^/projects { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # Most of the main PFE redirects | ||
| location ~* ^/(organizations|collections|favorites|talk|notifications|inbox|lab|admin|accounts|reset-password|settings|privacy|security|youth_privacy) { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # unsubscribe route uses redirects between panoptes and the UI code | ||
| # so needs it's own location block to handle the form submission POST | ||
| # and the GET page loading (PFE routing handles the path) | ||
| location /unsubscribe { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| if ($request_method ~ ^(GET|HEAD)$) { | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| set $proxy_host_header "zooniversestatic.z13.web.core.windows.net"; | ||
| } | ||
| if ($request_method = POST) { | ||
| proxy_pass https://panoptes.zooniverse.org$request_uri; | ||
| set $proxy_host_header "panoptes.zooniverse.org"; | ||
| } | ||
| proxy_set_header Host $proxy_host_header; | ||
| proxy_redirect /$host/ /; | ||
|
|
||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| set $proxy_path "www.zooniverse.org"; | ||
|
|
||
| # FEM project assets | ||
| location ~* ^/projects/(?:_next|assets)/.+?$ { | ||
| resolver 1.1.1.1; | ||
| proxy_pass "https://fe-project.preview.zooniverse.org"; | ||
| proxy_set_header Host fe-project.preview.zooniverse.org; | ||
|
|
||
| include /etc/nginx/proxy-security-headers.conf; | ||
| } | ||
|
|
||
| # PFE assets | ||
| location ~ \.(js|css)$ { | ||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path$request_uri; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # User profile page | ||
| location ~* ^/users/[\w-]+/?$ { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # User specific pages | ||
| location ~* ^/users/[\w-]+/((collections|favorites|message)?)/?$ { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # Default: /project/* to PFE | ||
| # Can be overridden by directives in nginx-project-redirects.conf | ||
| location ~* ^/projects { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # Most of the main PFE redirects | ||
| location ~* ^/(organizations|collections|favorites|talk|notifications|inbox|lab|admin|accounts|reset-password|settings|privacy|security|youth_privacy) { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # unsubscribe route uses redirects between panoptes and the UI code | ||
| # so needs it's own location block to handle the form submission POST | ||
| # and the GET page loading (PFE routing handles the path) | ||
| location /unsubscribe { | ||
| rewrite (?i)\.(jp(e)?g|gif|png|ico|txt|mp(3|4)|webm|og(a|g|m|v|x)|spx|opus|pdf|ttf|tar|gz|tgz|bz2|tbz2|zip)$ https://static.zooniverse.org/$proxy_path$request_uri; | ||
|
|
||
| resolver 1.1.1.1; | ||
| if ($request_method ~ ^(GET|HEAD)$) { | ||
| proxy_pass https://zooniversestatic.z13.web.core.windows.net/$proxy_path/; | ||
| set $proxy_host_header "zooniversestatic.z13.web.core.windows.net"; | ||
| } | ||
| if ($request_method = POST) { | ||
| proxy_pass https://panoptes.zooniverse.org$request_uri; | ||
| set $proxy_host_header "panoptes.zooniverse.org"; | ||
| } | ||
| proxy_set_header Host $proxy_host_header; | ||
| proxy_redirect /$host/ /; | ||
|
|
||
| include /etc/nginx/az-proxy-headers.conf; | ||
| } | ||
|
|
||
| # Example FEM project redirect | ||
| location ~* ^/projects/(?:[\w-]*?/)?brooke/i-fancy-cats/?(?:(classify|about)(?:/.+?)?)?/?$ { | ||
| resolver 1.1.1.1; | ||
| proxy_pass "https://fe-project.preview.zooniverse.org"; | ||
| proxy_set_header Host fe-project.preview.zooniverse.org; | ||
|
|
||
| include /etc/nginx/proxy-security-headers.conf; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.