Revert "Zuulv3: Convert all proxy rules to zuul-web"

This reverts commit 1ccf68fc96.

Change-Id: I18770c65c6dc9c1e2d91e08e7e1336e06d13d974
This commit is contained in:
James E. Blair 2018-02-05 12:27:27 -08:00
parent 1ccf68fc96
commit d44c025626
1 changed files with 18 additions and 2 deletions

View File

@ -40,9 +40,17 @@
<% end %>
<% if @zuulv3 %>
RewriteRule ^/connection/(.*) <%= @zuul_status_url %>/connection/$1 [P]
RewriteRule ^/status.json <%= @zuul_web_url %>/status.json [P]
RewriteRule ^/status.html <%= @zuul_web_url %>/status.html [P]
RewriteRule ^/jobs.json <%= @zuul_web_url %>/jobs.json [P]
RewriteRule ^/jobs.html <%= @zuul_web_url %>/jobs.html [P]
RewriteRule ^/builds.json <%= @zuul_web_url %>/builds.json [P]
RewriteRule ^/builds.html <%= @zuul_web_url %>/builds.html [P]
RewriteRule ^/console-stream <%= @zuul_web_url.sub('http://', 'ws://') %>/console-stream [P]
RewriteRule ^/stream.html <%= @zuul_web_url %>/stream.html [P]
RewriteRule ^/(.*).pub$ <%= @zuul_web_url %>/$1.pub [P]
RewriteRule ^/$ <%= @zuul_web_url %>/status.html [P]
RewriteRule ^/(.*)$ <%= @zuul_web_url %>/$1 [P]
<% end %>
AddOutputFilterByType DEFLATE application/json
@ -113,9 +121,17 @@
<% end %>
<% if @zuulv3 %>
RewriteRule ^/connection/(.*) <%= @zuul_status_url %>/connection/$1 [P]
RewriteRule ^/status.json <%= @zuul_web_url %>/status.json [P]
RewriteRule ^/status.html <%= @zuul_web_url %>/status.html [P]
RewriteRule ^/jobs.json <%= @zuul_web_url %>/jobs.json [P]
RewriteRule ^/jobs.html <%= @zuul_web_url %>/jobs.html [P]
RewriteRule ^/builds.json <%= @zuul_web_url %>/builds.json [P]
RewriteRule ^/builds.html <%= @zuul_web_url %>/builds.html [P]
RewriteRule ^/console-stream <%= @zuul_web_url.sub('http://', 'ws://') %>/console-stream [P]
RewriteRule ^/stream.html <%= @zuul_web_url %>/stream.html [P]
RewriteRule ^/(.*).pub$ <%= @zuul_web_url %>/$1.pub [P]
RewriteRule ^/$ <%= @zuul_web_url %>/status.html [P]
RewriteRule ^/(.*)$ <%= @zuul_web_url %>/$1 [P]
<% end %>
AddOutputFilterByType DEFLATE application/json