opendev
/
puppet-zuul
Code Issues Proposed changes

Zuulv3: Convert all proxy rules to zuul-web 

All Zuul v3 web services are handled by zuul-web now.

Change-Id: Id34949a364c80b86685aa5444750da0daabdf6f8
This commit is contained in:
James E. Blair 2018-02-03 07:53:16 -08:00
parent 8683244caf
commit 1ccf68fc96
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
templates/zuul.vhost.erb
View File

@ -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