opendev/puppet-zuul
Code Issues Proposed changes

Move zuul status to static.o.o.

Browse Source 
And update the status page to use common.js.
Redirect old zuul status urls to status.o.o.

Change-Id: I98e86eb78b70d5cbe53410919642f302e9709d19
Reviewed-on: https://review.openstack.org/25664
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-03-28 15:09:28 -07:00 committed by Jenkins
parent eca29342d0
commit 17cb181111
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/zuul.vhost.erb
View File

@ -1,6 +1,6 @@
<VirtualHost <%= scope.lookupvar("::zuul::vhost_name") %>:80> <VirtualHost <%= scope.lookupvar("::zuul::vhost_name") %>:80>
ServerAdmin <%= scope.lookupvar("::zuul::serveradmin") %> ServerAdmin <%= scope.lookupvar("::zuul::serveradmin") %>
DocumentRoot /var/lib/zuul/www DocumentRoot /var/www
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-error.log ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-error.log
@ -9,7 +9,8 @@
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-access.log combined CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-access.log combined
RewriteEngine on RewriteEngine on
RewriteRule ^/zuul/status$ http://127.0.0.1:8001/status [P] RewriteRule ^/$ http://status.openstack.org/zuul/ [R]
RewriteRule ^/zuul/status$ http://status.openstack.org/zuul/ [R]
RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P] RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P]
Alias /rechecks.html /var/www/recheckwatch/rechecks.html Alias /rechecks.html /var/www/recheckwatch/rechecks.html