85a2a5b0e8
Replace the use of '-default' in the new JJB devstack templates with the empty string. Shorten 'stable-BRANCH' to '-BRANCH'. Shorten 'devstack-vm' to 'dsvm'. Add 'devstack' in the position normally occupied by 'tempest' if appropriate for the job (eg cells). Set the single use flag for jobs that match 'dsvm'. Add 'dsvm' to the requirements integration job name (which incidentally was not matching the regex before, which is an error). Adjust elastic-recheck graph and log host directory patterns to match new job names. Change-Id: I79562f79f41c02b5898a1c5e15194ed9d7dc1a39
85 lines
2.9 KiB
Plaintext
85 lines
2.9 KiB
Plaintext
# -*- apache -*-
|
|
# ************************************
|
|
# 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 %>
|
|
|
|
# use Apache to compress the results afterwards, to save on the wire
|
|
# it's approx 18x savings of wire traffic to compress. We need to
|
|
# compress by content types that htmlify can produce
|
|
AddOutputFilterByType DEFLATE text/plain text/html
|
|
|
|
<FilesMatch \.html\.gz$>
|
|
ForceType text/html
|
|
AddDefaultCharset UTF-8
|
|
AddEncoding x-gzip gz
|
|
</FilesMatch>
|
|
<Directory <%= docroot %>>
|
|
Options <%= options %>
|
|
AllowOverride None
|
|
Order allow,deny
|
|
allow from all
|
|
</Directory>
|
|
|
|
<Directory <%= docroot %>/*/*/*/*/gate-tempest-dsvm*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/periodic/*/periodic-tempest-dsvm*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/*/*/*/*/gate-tempest-dsvm*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/periodic/*/periodic-tempest-dsvm*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
|
|
# old patterns, can be removed in July 2014
|
|
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
|
|
# old patterns, can be removed in February 2014
|
|
<Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/periodic/periodic-tempest-devstack*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
<Directory <%= docroot %>/periodic/periodic-tempest-devstack*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
|
|
RewriteEngine On
|
|
# rewrite all txt.gz & html.gz files to map to our internal htmlify wsgi app
|
|
RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT]
|
|
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT]
|
|
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
|
|
|
|
ErrorLog /var/log/apache2/<%= name %>_error.log
|
|
LogLevel warn
|
|
CustomLog /var/log/apache2/<%= name %>_access.log combined
|
|
ServerSignature Off
|
|
</VirtualHost>
|