From 1ccf68fc96cb5212c35a093339e7b61e8f34a77a Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Sat, 3 Feb 2018 07:53:16 -0800 Subject: [PATCH] Zuulv3: Convert all proxy rules to zuul-web All Zuul v3 web services are handled by zuul-web now. Change-Id: Id34949a364c80b86685aa5444750da0daabdf6f8 --- templates/zuul.vhost.erb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/templates/zuul.vhost.erb b/templates/zuul.vhost.erb index 6377378..7ab486a 100644 --- a/templates/zuul.vhost.erb +++ b/templates/zuul.vhost.erb @@ -40,17 +40,9 @@ <% 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 @@ -121,17 +113,9 @@ <% 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