opendev
/
puppet-zuul
Code Issues Proposed changes

Send websocket traffic to ws:// protocol 

The console-stream URL needs to be talked to over ws:// to make sure the
WebSocket upgrade headers are sent.

Change-Id: I38f1f0b0f05403b9a47acdf88d5d8059f9af6295
This commit is contained in:
Monty Taylor 2017-07-20 05:04:40 +09:00
parent 0ef5671c85
commit bdaeb08041
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zuul.vhost.erb
View File

@ -36,7 +36,7 @@
RewriteRule ^/status.json$ <%= @zuul_status_url %>/status.json [P]
RewriteRule ^/status/(.*) <%= @zuul_status_url %>/status/$1 [P]
RewriteRule ^/connection/(.*) <%= @zuul_scheduler_url %>/connection/$1 [P]
RewriteRule ^/console-stream <%= @zuul_web_url %>/console-stream [P]
RewriteRule ^/console-stream <%= @zuul_web_url.sub('http://', 'ws://') %>/console-stream [P]
RewriteRule ^/static/(.*) <%= @zuul_web_url %>/static/$1 [P]
RewriteRule ^/jobs/(.*) <%= @zuul_web_url %>/jobs/$1 [P]
@ -105,7 +105,7 @@
RewriteRule ^/status.json$ <%= @zuul_status_url %>/status.json [P]
RewriteRule ^/status/(.*) <%= @zuul_status_url %>/status/$1 [P]
RewriteRule ^/connection/(.*) <%= @zuul_scheduler_url %>/connection/$1 [P]
RewriteRule ^/console-stream <%= @zuul_web_url %>/console-stream [P]
RewriteRule ^/console-stream <%= @zuul_web_url.sub('http://', 'ws://') %>/console-stream [P]
RewriteRule ^/static/(.*) <%= @zuul_web_url %>/static/$1 [P]
RewriteRule ^/jobs/(.*) <%= @zuul_web_url %>/jobs/$1 [P]