7e480c6c18
* modules/openstack_project/templates/logs-dev.vhost.erb * modules/openstack_project/templates/logs.vhost.erb: With the recent advent of an additional parent node in the job log path, the ReadmeName was no longer being applied to new log directories. This corrects it by adding duplicate Directory blocks for them with the new pattern. Note that ReadmeName does not work inside regular expression blocks like DirectoryMatch, but the old Directory blocks can be removed when those logs expire in about 6 months time. Also added patterns to provide readme files for equivalent periodic jobs. Change-Id: Ib12f1d6f033b8129af38d694f7b221bea9614ecd
63 lines
2.0 KiB
Plaintext
63 lines
2.0 KiB
Plaintext
# ************************************
|
|
# 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 %>
|
|
<FilesMatch \.txt\.gz$>
|
|
ForceType text/plain
|
|
AddDefaultCharset UTF-8
|
|
AddEncoding x-gzip gz
|
|
</FilesMatch>
|
|
<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-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>
|
|
|
|
ErrorLog /var/log/apache2/<%= name %>_error.log
|
|
LogLevel warn
|
|
CustomLog /var/log/apache2/<%= name %>_access.log combined
|
|
ServerSignature Off
|
|
</VirtualHost>
|