From ba6e0e77dcad2cdd2da9064c29edeed453d6612b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Sat, 29 Sep 2018 11:52:02 -0700
Subject: [PATCH] Revert "Add rewrite rules for HTML5 url"

This reverts commit ff1f91895df54c701da778e5de16f8237a058008.

See https://review.openstack.org/606611 which reverted the react
rewrite.

Change-Id: I41f12b0733a7ba3f0dfff265f806f3562879a160
---
 templates/zuulv3.vhost.erb | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/templates/zuulv3.vhost.erb b/templates/zuulv3.vhost.erb
index c3d6eab..f33fb56 100644
--- a/templates/zuulv3.vhost.erb
+++ b/templates/zuulv3.vhost.erb
@@ -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>