Fix log Footer README's for 'check-tempest-dsvm'

Previously the footer readme in the apache configuration for
logs.openstack.org only matched 'gate-tempest-dsvm' and not the check
jobs (eg check-tempest-dsvm).

This commit also removes depreciated log store patterns

Change-Id: I2628be003801eee8bfea5162bdfd034529cf30fb
This commit is contained in:
Joshua Hesketh 2014-02-18 13:58:06 +11:00
parent ba96899c7a
commit c6cb34aec5
2 changed files with 8 additions and 36 deletions

View File

@ -30,16 +30,16 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
allow from all
</Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-dsvm*/*>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-dsvm*/*>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-dsvm*/*/logs/>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-dsvm*/*/logs/>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
@ -57,20 +57,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
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]

View File

@ -30,16 +30,16 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
allow from all
</Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-dsvm*/*>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-dsvm*/*>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html
</Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-dsvm*/*/logs/>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-dsvm*/*/logs/>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html
</Directory>
@ -57,20 +57,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
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]