opendev/system-config
Code Issues Proposed changes

Additional path patterns for log readme files.

Browse Source 
* 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
This commit is contained in:
Jeremy Stanley 2013-07-29 16:05:59 +00:00
parent 3b11fd3543
commit 7e480c6c18
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/openstack_project/templates/logs-dev.vhost.erb
View File

@ -29,12 +29,33 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
Order allow,deny Order allow,deny
allow from all allow from all
</Directory> </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*/*> <Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/periodic-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*/logs/> <Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/periodic-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
RewriteEngine On RewriteEngine On
# rewrite all txt.gz files to map to our internal htmlify wsgi app # rewrite all txt.gz files to map to our internal htmlify wsgi app

21
modules/openstack_project/templates/logs.vhost.erb
View File

@ -27,12 +27,33 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
Order allow,deny Order allow,deny
allow from all allow from all
</Directory> </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*/*> <Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/periodic-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*/logs/> <Directory <%= docroot %>/*/*/*/gate-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/periodic-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
ErrorLog /var/log/apache2/<%= name %>_error.log ErrorLog /var/log/apache2/<%= name %>_error.log
LogLevel warn LogLevel warn