opendev
/
puppet-zuul
Code Issues Proposed changes

Move unanchored general rules after specific ones 

The match ^/jobs doesn't have an ending anchor, so it matches /jobs
and /jobs.html - which makes the url
https://zuul.openstack.org/jobs.html return JSON. While the JSON is
valid job data, raw JSON is less pleasant for a human to read than HTML
(go figure)

Move the less specific entries to after the more specific entries.

Change-Id: I80f7fbe54d96cc151ef8da28465445f93092aadd
This commit is contained in:
Monty Taylor 2018-02-20 06:37:22 -06:00
parent 7e99dca02d
commit 8f68109b2e
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/zuul.vhost.erb
View File

@ -43,15 +43,15 @@
<% if @zuulv3 %>
RewriteRule ^/connection/(.*) <%= @zuul_web_url %>/connection/$1 [P]
RewriteRule ^/status <%= @zuul_web_full_url %>/status [P]
RewriteRule ^/status.json <%= @zuul_web_full_url %>/status.json [P]
RewriteRule ^/status.html <%= @zuul_web_full_url %>/status.html [P]
RewriteRule ^/jobs <%= @zuul_web_full_url %>/jobs [P]
RewriteRule ^/status <%= @zuul_web_full_url %>/status [P]
RewriteRule ^/jobs.json <%= @zuul_web_full_url %>/jobs.json [P]
RewriteRule ^/jobs.html <%= @zuul_web_full_url %>/jobs.html [P]
RewriteRule ^/builds <%= @zuul_web_full_url %>/builds [P]
RewriteRule ^/jobs <%= @zuul_web_full_url %>/jobs [P]
RewriteRule ^/builds.json <%= @zuul_web_full_url %>/builds.json [P]
RewriteRule ^/builds.html <%= @zuul_web_full_url %>/builds.html [P]
RewriteRule ^/builds <%= @zuul_web_full_url %>/builds [P]
RewriteRule ^/console-stream <%= @zuul_web_full_url.sub('http://', 'ws://') %>/console-stream [P]
RewriteRule ^/stream.html <%= @zuul_web_full_url %>/stream.html [P]
RewriteRule ^/(.*).pub$ <%= @zuul_web_full_url %>/$1.pub [P]
@ -139,15 +139,15 @@
<% if @zuulv3 %>
RewriteRule ^/connection/(.*) <%= @zuul_web_url %>/connection/$1 [P]
RewriteRule ^/status <%= @zuul_web_full_url %>/status [P]
RewriteRule ^/status.json <%= @zuul_web_full_url %>/status.json [P]
RewriteRule ^/status.html <%= @zuul_web_full_url %>/status.html [P]
RewriteRule ^/jobs <%= @zuul_web_full_url %>/jobs [P]
RewriteRule ^/status <%= @zuul_web_full_url %>/status [P]
RewriteRule ^/jobs.json <%= @zuul_web_full_url %>/jobs.json [P]
RewriteRule ^/jobs.html <%= @zuul_web_full_url %>/jobs.html [P]
RewriteRule ^/builds <%= @zuul_web_full_url %>/builds [P]
RewriteRule ^/jobs <%= @zuul_web_full_url %>/jobs [P]
RewriteRule ^/builds.json <%= @zuul_web_full_url %>/builds.json [P]
RewriteRule ^/builds.html <%= @zuul_web_full_url %>/builds.html [P]
RewriteRule ^/builds <%= @zuul_web_full_url %>/builds [P]
RewriteRule ^/console-stream <%= @zuul_web_full_url.sub('http://', 'ws://') %>/console-stream [P]
RewriteRule ^/stream.html <%= @zuul_web_full_url %>/stream.html [P]
RewriteRule ^/(.*).pub$ <%= @zuul_web_full_url %>/$1.pub [P]