diff --git a/modules/openstack_project/files/zuul/status.html b/modules/openstack_project/files/zuul/status.html index d5338ea08b..20f6932e6c 100644 --- a/modules/openstack_project/files/zuul/status.html +++ b/modules/openstack_project/files/zuul/status.html @@ -66,11 +66,16 @@ a:link { Zuul Status - - - - - + + + + + @@ -93,26 +98,7 @@ a:link { -
- -
+

Zuul Status

@@ -183,46 +169,6 @@ $("#graph-container").append($(new Image()).addClass('graph').graphite({
-
-
- -
+ diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 15282917e1..7fc22015bd 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -169,6 +169,10 @@ class openstack_project::static ( ensure => directory, } + package { 'libjs-jquery': + ensure => present, + } + file { '/srv/static/status/index.html': ensure => present, source => 'puppet:///modules/openstack_project/status/index.html', @@ -181,6 +185,63 @@ class openstack_project::static ( require => File['/srv/static/status'], } + file { '/srv/static/status/jquery.min.js': + ensure => link, + target => '/usr/share/javascript/jquery/jquery.min.js', + require => [File['/srv/static/status'], + Package['libjs-jquery']], + } + + vcsrepo { '/opt/jquery-visibility': + ensure => latest, + provider => git, + revision => 'master', + source => 'https://github.com/mathiasbynens/jquery-visibility.git', + } + + file { '/srv/static/status/jquery-visibility.min.js': + ensure => link, + target => '/opt/jquery-visibility/jquery-visibility.min.js', + require => [File['/srv/static/status'], + Vcsrepo['/opt/jquery-visibility']], + } + + vcsrepo { '/opt/jquery-graphite': + ensure => latest, + provider => git, + revision => 'master', + source => 'https://github.com/prestontimmons/graphitejs.git', + } + + file { '/srv/static/status/jquery-graphite.js': + ensure => link, + target => '/opt/jquery-graphite/jquery.graphite.js', + require => [File['/srv/static/status'], + Vcsrepo['/opt/jquery-graphite']], + } + + ########################################################### + # Status - zuul + + file { '/srv/static/status/zuul': + ensure => directory, + } + + file { '/srv/static/status/zuul/index.html': + ensure => present, + source => 'puppet:///modules/openstack_project/zuul/status.html', + require => File['/srv/static/status/zuul'], + } + + file { '/srv/static/status/zuul/status.js': + ensure => present, + source => 'puppet:///modules/openstack_project/zuul/status.js', + require => File['/srv/static/status/zuul'], + } + + ########################################################### + # Status - reviewday + include reviewday reviewday::site { 'reviewday': diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp index 5efdbd5734..74d42bbd5c 100644 --- a/modules/openstack_project/manifests/zuul.pp +++ b/modules/openstack_project/manifests/zuul.pp @@ -65,56 +65,38 @@ class openstack_project::zuul( } file { '/var/lib/zuul/www': - ensure => directory, - require => File['/var/lib/zuul'], + ensure => absent, } file { '/var/lib/zuul/www/index.html': - ensure => present, - source => 'puppet:///modules/openstack_project/zuul/status.html', - require => File['/var/lib/zuul/www'], + ensure => absent, } package { 'libjs-jquery': - ensure => present, + ensure => absent, } file { '/var/lib/zuul/www/jquery.min.js': - ensure => link, - target => '/usr/share/javascript/jquery/jquery.min.js', - require => [File['/var/lib/zuul/www'], - Package['libjs-jquery']], + ensure => absent, } file { '/var/lib/zuul/www/status.js': - ensure => present, - source => 'puppet:///modules/openstack_project/zuul/status.js', - require => File['/var/lib/zuul/www'], + ensure => absent, } - vcsrepo { '/opt/jquery-visibility': - ensure => latest, - provider => git, - revision => 'master', - source => 'https://github.com/mathiasbynens/jquery-visibility.git', + file { '/opt/jquery-visibility': + ensure => absent, } file { '/var/lib/zuul/www/jquery-visibility.min.js': - ensure => link, - target => '/opt/jquery-visibility/jquery-visibility.min.js', - require => File['/var/lib/zuul/www'], + ensure => absent, } - vcsrepo { '/opt/jquery-graphite': - ensure => latest, - provider => git, - revision => 'master', - source => 'https://github.com/prestontimmons/graphitejs.git', + file { '/opt/jquery-graphite': + ensure => absent, } file { '/var/lib/zuul/www/jquery-graphite.js': - ensure => link, - target => '/opt/jquery-graphite/jquery.graphite.js', - require => File['/var/lib/zuul/www'], + ensure => absent, } } diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb index ec9c39cea4..13f766fe38 100644 --- a/modules/openstack_project/templates/status.vhost.erb +++ b/modules/openstack_project/templates/status.vhost.erb @@ -21,13 +21,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %> Allow from all - RewriteRule ^/zuul$ /zuul/ [R] - RewriteRule ^/zuul/(.*)$ http://zuul.openstack.org/$1 [P] - - Order allow,deny - Allow from all - - RewriteRule ^/release$ /release/ [R] RewriteRule ^/release/(.*)$ http://old-wiki.openstack.org/release/$1 [P] diff --git a/modules/zuul/templates/zuul.vhost.erb b/modules/zuul/templates/zuul.vhost.erb index 746d6dd58c..4b553b7b45 100644 --- a/modules/zuul/templates/zuul.vhost.erb +++ b/modules/zuul/templates/zuul.vhost.erb @@ -1,6 +1,6 @@ :80> ServerAdmin <%= scope.lookupvar("::zuul::serveradmin") %> - DocumentRoot /var/lib/zuul/www + DocumentRoot /var/www 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 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] Alias /rechecks.html /var/www/recheckwatch/rechecks.html