Reroute home page to FEM #372
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
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"; | ||
|
There was a problem hiding this comment. Just flagging one specific case to ask a syntax question: should direct assignment of There was a problem hiding this comment. As far as I know it doesn't matter and we're just kind of inconsistent in this repo. You need quotes to avoid escaping certain characters but otherwise it works either way. |
||
| 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the ordering of this directive, above and separate from the rest of the
projects/pieces (starting on L37), matter?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, the ordering is important in that it's gotta be before the other projects matcher. And though I grouped it with the other asset matcher, it could be moved further down.
In this case, before matching with
~* ^/projects, I want to check for FEM assets (the assets and _next folders) and return them first as they're exceptions to the exceptions. I could switch the latter to a prefix matcher since they have a lower priority than regex matches, but this way seems more obvious: match^/projectsplus those folders explicitly and route to FEM, or match just^/projectsand point to PFE.The FEM project redirects file itself is included first for the same reason.