Revert "Revert "Revert "Add rewrite rules for HTML5 url"""
This reverts commit 0bdd3c9a15
.
The js tarball publication job is broken:
http://logs.openstack.org/c7/c7148815378b9f26751ec0729a96894e7cd6b4c3/post/publish-openstack-javascript-content/05c6626/ara-report/result/72fa45d7-c12e-4af5-b520-5e1e73e4853b/
Change-Id: I76a50203968de07b5449fbf46c2dd2d227cc2cfe
This commit is contained in:
parent
0bdd3c9a15
commit
002efe1bbd
|
@ -40,24 +40,19 @@
|
|||
<% end -%>
|
||||
|
||||
<% if scope.lookupvar('::zuul::web::tenant_name') != '' -%>
|
||||
RewriteRule ^/$ /status [L]
|
||||
RewriteRule ^/$ /status.html [L]
|
||||
# Backwards compat for old status urls. Should be removed in a few weeks.
|
||||
RewriteRule ^/status$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/tenant/<%= scope.lookupvar('::zuul::web::tenant_name') %>/status [P,L]
|
||||
RewriteRule ^/api/connection/(.*)$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/connection/$1 [P,L]
|
||||
RewriteRule ^/api/console-stream <%= scope.lookupvar('::zuul::web::websocket_url') %>/api/tenant/<%= scope.lookupvar('::zuul::web::tenant_name') %>/console-stream [P,L]
|
||||
RewriteRule ^/api/(.*)$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/tenant/<%= scope.lookupvar('::zuul::web::tenant_name') %>/$1 [P,L]
|
||||
RewriteRule ^/status$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/tenant/<%= scope.lookupvar('::zuul::web::tenant_name') %>/status [P]
|
||||
RewriteRule ^/api/connection/(.*)$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/connection/$1 [P]
|
||||
RewriteRule ^/api/console-stream <%= scope.lookupvar('::zuul::web::websocket_url') %>/api/tenant/<%= scope.lookupvar('::zuul::web::tenant_name') %>/console-stream [P]
|
||||
RewriteRule ^/api/(.*)$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/tenant/<%= scope.lookupvar('::zuul::web::tenant_name') %>/$1 [P]
|
||||
<% else -%>
|
||||
RewriteRule ^/$ /tenants [L]
|
||||
RewriteRule ^/$ /tenants.html [L]
|
||||
RewriteRule ^/t/(.*) /$1 [L]
|
||||
RewriteRule ^/api/tenant/(.*)/console-stream <%= scope.lookupvar('::zuul::web::websocket_url') %>/api/tenant/$1/console-stream [P,L]
|
||||
RewriteRule ^/api/(.*)$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/$1 [P,L]
|
||||
RewriteRule ^/api/tenant/(.*)/console-stream <%= scope.lookupvar('::zuul::web::websocket_url') %>/api/tenant/$1/console-stream [P]
|
||||
RewriteRule ^/api/(.*)$ <%= scope.lookupvar('::zuul::web::web_url') %>/api/$1 [P]
|
||||
<% end -%>
|
||||
|
||||
# Rewrite HTML5 route to index.html
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteRule . /index.html [L]
|
||||
|
||||
AddOutputFilterByType DEFLATE application/json
|
||||
|
||||
<IfModule mod_cache.c>
|
||||
|
|
Loading…
Reference in New Issue