diff --git a/manifests/init.pp b/manifests/init.pp index e4902b8..01a3c9b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -89,6 +89,7 @@ class zuul ( $zuul_web_url = 'http://127.0.0.1:9000', $zuul_scheduler_url = 'http://127.0.0.1:8001', $site_variables_yaml_file = undef, + $zuul_tenant_name = undef, ) { include ::httpd include ::pip @@ -104,6 +105,12 @@ class zuul ( $pip_command = 'pip' } + if ($zuul_tenant_name) { + $zuul_web_full_url = "${zuul_web_url}/${zuul_tenant_name}" + } else { + $zuul_web_full_url = $zuul_web_url + } + $packages = [ 'libffi-dev', 'libssl-dev', diff --git a/templates/zuul.vhost.erb b/templates/zuul.vhost.erb index 9c3a741..b292367 100644 --- a/templates/zuul.vhost.erb +++ b/templates/zuul.vhost.erb @@ -41,16 +41,16 @@ <% if @zuulv3 %> RewriteRule ^/connection/(.*) <%= @zuul_web_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 ^/status.json <%= @zuul_web_full_url %>/status.json [P] + RewriteRule ^/status.html <%= @zuul_web_full_url %>/status.html [P] + RewriteRule ^/jobs.json <%= @zuul_web_full_url %>/jobs.json [P] + RewriteRule ^/jobs.html <%= @zuul_web_full_url %>/jobs.html [P] + RewriteRule ^/builds.json <%= @zuul_web_full_url %>/builds.json [P] + RewriteRule ^/builds.html <%= @zuul_web_full_url %>/builds.html [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] + RewriteRule ^/$ <%= @zuul_web_full_url %>/status.html [P] <% end %> AddOutputFilterByType DEFLATE application/json @@ -122,16 +122,16 @@ <% if @zuulv3 %> RewriteRule ^/connection/(.*) <%= @zuul_web_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 ^/status.json <%= @zuul_web_full_url %>/status.json [P] + RewriteRule ^/status.html <%= @zuul_web_full_url %>/status.html [P] + RewriteRule ^/jobs.json <%= @zuul_web_full_url %>/jobs.json [P] + RewriteRule ^/jobs.html <%= @zuul_web_full_url %>/jobs.html [P] + RewriteRule ^/builds.json <%= @zuul_web_full_url %>/builds.json [P] + RewriteRule ^/builds.html <%= @zuul_web_full_url %>/builds.html [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] + RewriteRule ^/$ <%= @zuul_web_full_url %>/status.html [P] <% end %> AddOutputFilterByType DEFLATE application/json