Add status.o.o vhost to static.o.o.
Add a nice index page. Proxy zuul-related status URLs to zuul.o.o. Proxy release, reviews, and bugday URLs to old-wiki.openstack.org which will point to the current wiki site. This will let us move status.o.o to static.o.o independent of when the individual status pages are moved. Change-Id: I695e281811cd8f6b27025f6626864ed4ea09cae9 Reviewed-on: https://review.openstack.org/18626 Reviewed-by: Monty Taylor <mordred@inaugust.com> 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
Jenkins
parent
7b37c36581
commit
bd438453b8
161
modules/openstack_project/files/status/index.html
Normal file
161
modules/openstack_project/files/status/index.html
Normal file
@ -0,0 +1,161 @@
|
||||
<html xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:py="http://genshi.edgewall.org/"
|
||||
lang="en">
|
||||
<HEAD>
|
||||
<style type="text/css">
|
||||
#blurb-container {
|
||||
max-width: 950px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.blurb {
|
||||
float: left;
|
||||
width: 25em;
|
||||
height: 22ex;
|
||||
padding: 4px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<TITLE>OpenStack Project Status</TITLE>
|
||||
|
||||
<script type="text/javascript" src="jquery.min.js"></script>
|
||||
<script type="text/javascript" src="jquery-visibility.min.js"></script>
|
||||
<script type="text/javascript" src="status.js"></script>
|
||||
|
||||
|
||||
<!-- Google Fonts -->
|
||||
<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'/>
|
||||
|
||||
<!-- Framework CSS -->
|
||||
<link rel="stylesheet" href="http://www.openstack.org/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection"/>
|
||||
<link rel="stylesheet" href="http://www.openstack.org/themes/openstack/css/blueprint/print.css" type="text/css" media="print"/>
|
||||
|
||||
<!-- IE CSS -->
|
||||
<!--[if lt IE 8]><link rel="stylesheet" href="http://www.openstack.org/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
|
||||
|
||||
<!-- OpenStack Specific CSS -->
|
||||
|
||||
<link rel="stylesheet" href="http://www.openstack.org/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print"/>
|
||||
|
||||
<!-- Page Specific CSS -->
|
||||
<link rel="stylesheet" href="http://www.openstack.org/themes/openstack/css/home.css" type="text/css" media="screen, projection, print"/>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="http://www.openstack.org/themes/openstack/css/main.css" />
|
||||
</HEAD>
|
||||
|
||||
<BODY>
|
||||
<div id="message-container">
|
||||
<div class="container">
|
||||
<div class="span-24 last">
|
||||
<p id="message"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div id="header">
|
||||
<div class="span-5">
|
||||
<h1 id="logo"><a href="/">Open Stack</a></h1>
|
||||
</div>
|
||||
<div class="span-19 last blueLine">
|
||||
|
||||
<div id="navigation" class="span-19">
|
||||
<ul id="Menu1">
|
||||
<li><a href="/" class="current" >Status</a></li>
|
||||
<li><a href="/zuul/">Zuul</a></li>
|
||||
<li><a href="/rechecks/">Rechecks</a></li>
|
||||
<li><a href="/release/">Release</a></li>
|
||||
<li><a href="/reviews/">Reviews</a></li>
|
||||
<li><a href="/bugday/">Bugday</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="blurb-container">
|
||||
<h1>OpenStack Infrastructure and Project Status</h1>
|
||||
|
||||
<div class="blurb">
|
||||
<h2 class="subhead"><a href="/zuul/">Zuul</a></h2>
|
||||
<p>
|
||||
Zuul is the project gating and automation system that tests
|
||||
and merges changes as well as publishing releases and
|
||||
documentation.
|
||||
</p>
|
||||
</div>
|
||||
<div class="blurb">
|
||||
<h2 class="subhead"><a href="/rechecks/">Rechecks</a></h2>
|
||||
<p>
|
||||
When the cause of a test failure is nondeterministic,
|
||||
developers can request that it be retested by leaving a
|
||||
comment in Gerrit of the form "recheck bug #". This page
|
||||
collects those comments and displays the most commonly seen
|
||||
bugs.
|
||||
</p>
|
||||
</div>
|
||||
<div class="blurb">
|
||||
<h2 class="subhead"><a href="/release/">Release</a></h2>
|
||||
<p>
|
||||
Blueprints targeted for the next release are tracked on this
|
||||
page along with overall progress toward completion.
|
||||
</p>
|
||||
</div>
|
||||
<div class="blurb">
|
||||
<h2 class="subhead"><a href="/reviews/">Reviews</a></h2>
|
||||
<p>
|
||||
Important reviews are ranked according to blueprint and bug
|
||||
priority.
|
||||
</p>
|
||||
</div>
|
||||
<div class="blurb">
|
||||
<h2 class="subhead"><a href="/bugday/">Bugday</a></h2>
|
||||
<p>
|
||||
During official bug days, this page is updated with real-time
|
||||
stats.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<hr />
|
||||
<div id="footer">
|
||||
<div class="span-4">
|
||||
<h3>OpenStack</h3>
|
||||
<ul>
|
||||
<li><a href="http://www.openstack.org/projects/">Projects</a></li>
|
||||
<li><a href="http://www.openstack.org/openstack-security/">OpenStack Security</a></li>
|
||||
<li><a href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
|
||||
<li><a href="http://www.openstack.org/blog/">Blog</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span-4">
|
||||
<h3>Community</h3>
|
||||
<ul>
|
||||
<li><a href="http://www.openstack.org/community/">User Groups</a></li>
|
||||
<li><a href="http://www.openstack.org/events/">Events</a></li>
|
||||
<li><a href="http://www.openstack.org/jobs/">Jobs</a></li>
|
||||
<li><a href="http://www.openstack.org/companies/">Companies</a></li>
|
||||
<li><a href="http://wiki.openstack.org/HowToContribute">Contribute</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span-4">
|
||||
<h3>Documentation</h3>
|
||||
<ul>
|
||||
<li><a href="http://docs.openstack.org/">OpenStack Manuals</a></li>
|
||||
<li><a href="http://docs.openstack.org/diablo/openstack-compute/starter/content/">Getting Started</a></li>
|
||||
<li><a href="http://wiki.openstack.org/">Wiki</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span-4 last">
|
||||
<h3>Branding & Legal</h3>
|
||||
<ul>
|
||||
<li><a href="http://www.openstack.org/brand/">Logos & Guidelines</a></li>
|
||||
<li><a href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
|
||||
<li><a href="http://www.openstack.org/privacy/">Privacy Policy</a></li>
|
||||
<li><a href="http://wiki.openstack.org/CLA">OpenStack CLA</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</BODY>
|
||||
</html>
|
||||
@ -45,6 +45,14 @@ class openstack_project::static (
|
||||
require => File['/srv/static/docs-draft'],
|
||||
}
|
||||
|
||||
apache::vhost { 'status.openstack.org':
|
||||
port => 80,
|
||||
priority => '50',
|
||||
docroot => '/srv/static/status',
|
||||
template => 'openstack_project/status.vhost.erb',
|
||||
require => File['/srv/static/status'],
|
||||
}
|
||||
|
||||
file { '/srv/static':
|
||||
ensure => directory,
|
||||
}
|
||||
@ -92,6 +100,16 @@ class openstack_project::static (
|
||||
require => File['/srv/static/docs-draft'],
|
||||
}
|
||||
|
||||
file { '/srv/static/status':
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
file { '/srv/static/status/index.html':
|
||||
ensure => present,
|
||||
source => 'puppet:///modules/openstack_project/status/index.html',
|
||||
require => File['/srv/static/status'],
|
||||
}
|
||||
|
||||
cron { 'gziplogs':
|
||||
user => 'root',
|
||||
hour => '*/6',
|
||||
|
||||
62
modules/openstack_project/templates/status.vhost.erb
Normal file
62
modules/openstack_project/templates/status.vhost.erb
Normal file
@ -0,0 +1,62 @@
|
||||
# ************************************
|
||||
# Managed by Puppet
|
||||
# ************************************
|
||||
|
||||
NameVirtualHost <%= vhost_name %>:<%= port %>
|
||||
<VirtualHost <%= vhost_name %>:<%= port %>>
|
||||
ServerName <%= srvname %>
|
||||
<% if serveraliases.is_a? Array -%>
|
||||
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
|
||||
<% elsif serveraliases != '' -%>
|
||||
<%= " ServerAlias #{serveraliases}" %>
|
||||
<% end -%>
|
||||
DocumentRoot <%= docroot %>
|
||||
|
||||
RewriteEngine on
|
||||
|
||||
RewriteRule ^/rechecks$ /rechecks/ [R]
|
||||
RewriteRule ^/rechecks/$ http://zuul.openstack.org/rechecks.html [P]
|
||||
<Location /rechecks/>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Location>
|
||||
|
||||
RewriteRule ^/zuul$ /zuul/ [R]
|
||||
RewriteRule ^/zuul/(.*)$ http://zuul.openstack.org/$1 [P]
|
||||
<Location /zuul/>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Location>
|
||||
|
||||
RewriteRule ^/release$ /release/ [R]
|
||||
RewriteRule ^/release/$ http://old-wiki.openstack.org/release/ [P]
|
||||
<Location /release/>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Location>
|
||||
|
||||
RewriteRule ^/reviews$ /reviews/ [R]
|
||||
RewriteRule ^/reviews/$ http://old-wiki.openstack.org/reviews/ [P]
|
||||
<Location /reviews/>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Location>
|
||||
|
||||
RewriteRule ^/bugday$ /bugday/ [R]
|
||||
RewriteRule ^/bugday/$ http://old-wiki.openstack.org/bugday/ [P]
|
||||
<Location /bugday/>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Location>
|
||||
|
||||
<Directory <%= docroot %>>
|
||||
Options <%= options %>
|
||||
AllowOverride None
|
||||
Order allow,deny
|
||||
allow from all
|
||||
</Directory>
|
||||
ErrorLog /var/log/apache2/<%= name %>_error.log
|
||||
LogLevel warn
|
||||
CustomLog /var/log/apache2/<%= name %>_access.log combined
|
||||
ServerSignature Off
|
||||
</VirtualHost>
|
||||
Loading…
Reference in New Issue
Block a user