Unified Diff: modules/web/templates/site.conf.erb
Issue 29538581:
#3421 - Do root rewrite before rewriting to translated page (Closed)
Base URL: https://hg1/infrastructure
Patch Set: more details in commit msg
Created Sept. 11, 2017, 8:48 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/web/templates/site.conf.erb |
| =================================================================== |
| --- a/modules/web/templates/site.conf.erb |
| +++ b/modules/web/templates/site.conf.erb |
| @@ -13,6 +13,12 @@ |
| { |
| expires 1d; |
| + # Redirect server/language root |
| + |
| + rewrite ^/$ /$index_page last; |
| + rewrite ^/(\w\w(_\w\w)?)$ /$1/ permanent; |
| + rewrite ^/(\w\w(_\w\w)?)/$ /$1/$index_page last; |
| + |
| # Match Accept-Language header against available languages |
| set $preferredLang en; |
| @@ -47,11 +53,6 @@ |
| rewrite ^(.*) /en$1 last; |
| } |
| - # Redirect server/language root |
| - |
| - rewrite ^/$ /$index_page last; |
| - rewrite ^/(\w\w(_\w\w)?)$ /$1/ permanent; |
| - rewrite ^/(\w\w(_\w\w)?)/$ /$1/$index_page last; |
| } |
| <% if @multiplexer_locations %> |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
