opendev
/
puppet-zuul
Code Issues Proposed changes

Add OpenStack themed status screen for Zuul. 

Requires Zuul support for JSON status endpoints.

Change-Id: I899a54af6d380aa2836a85757492e7590be90e8b
Reviewed-on: https://review.openstack.org/18580
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-12-22 11:05:58 -08:00 committed by Jenkins
parent bdce24b4af
commit dd376c61bd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -124,7 +124,7 @@ class zuul (
file { '/var/lib/zuul/git':
ensure => directory,
owner => 'zuul',
require => User['zuul'],
require => File['/var/lib/zuul'],
}
file { '/var/lib/zuul/ssh':

5
templates/zuul.vhost.erb
View File

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