diff --git a/modules/openstack_project/templates/logs-dev.vhost.erb b/modules/openstack_project/templates/logs-dev.vhost.erb index c073b0bcd2..0d12464002 100644 --- a/modules/openstack_project/templates/logs-dev.vhost.erb +++ b/modules/openstack_project/templates/logs-dev.vhost.erb @@ -30,16 +30,16 @@ NameVirtualHost <%= vhost_name %>:<%= port %> allow from all - /*/*/*/*/gate-tempest-dsvm*/*> + /*/*/*/*/*-tempest-dsvm*/*> ReadmeName /help/tempest-overview.html - /periodic/*/periodic-tempest-dsvm*/*> + /periodic*/*/*-tempest-dsvm*/*> ReadmeName /help/tempest-overview.html - /*/*/*/*/gate-tempest-dsvm*/*/logs/> + /*/*/*/*/*-tempest-dsvm*/*/logs/> ReadmeName /help/tempest-logs.html - /periodic/*/periodic-tempest-dsvm*/*/logs/> + /periodic*/*/*-tempest-dsvm*/*/logs/> ReadmeName /help/tempest-logs.html @@ -57,20 +57,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %> ReadmeName /help/tempest-logs.html - # old patterns, can be removed in February 2014 - /*/*/*/gate-tempest-devstack*/*> - ReadmeName /help/tempest-overview.html - - /periodic/periodic-tempest-devstack*/*> - ReadmeName /help/tempest-overview.html - - /*/*/*/gate-tempest-devstack*/*/logs/> - ReadmeName /help/tempest-logs.html - - /periodic/periodic-tempest-devstack*/*/logs/> - ReadmeName /help/tempest-logs.html - - 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] diff --git a/modules/openstack_project/templates/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb index c073b0bcd2..0d12464002 100644 --- a/modules/openstack_project/templates/logs.vhost.erb +++ b/modules/openstack_project/templates/logs.vhost.erb @@ -30,16 +30,16 @@ NameVirtualHost <%= vhost_name %>:<%= port %> allow from all - /*/*/*/*/gate-tempest-dsvm*/*> + /*/*/*/*/*-tempest-dsvm*/*> ReadmeName /help/tempest-overview.html - /periodic/*/periodic-tempest-dsvm*/*> + /periodic*/*/*-tempest-dsvm*/*> ReadmeName /help/tempest-overview.html - /*/*/*/*/gate-tempest-dsvm*/*/logs/> + /*/*/*/*/*-tempest-dsvm*/*/logs/> ReadmeName /help/tempest-logs.html - /periodic/*/periodic-tempest-dsvm*/*/logs/> + /periodic*/*/*-tempest-dsvm*/*/logs/> ReadmeName /help/tempest-logs.html @@ -57,20 +57,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %> ReadmeName /help/tempest-logs.html - # old patterns, can be removed in February 2014 - /*/*/*/gate-tempest-devstack*/*> - ReadmeName /help/tempest-overview.html - - /periodic/periodic-tempest-devstack*/*> - ReadmeName /help/tempest-overview.html - - /*/*/*/gate-tempest-devstack*/*/logs/> - ReadmeName /help/tempest-logs.html - - /periodic/periodic-tempest-devstack*/*/logs/> - ReadmeName /help/tempest-logs.html - - 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]