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 </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] 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 </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]