diff --git a/modules/openstack_project/templates/logs-dev.vhost.erb b/modules/openstack_project/templates/logs-dev.vhost.erb index 108962a034..727f76e3c8 100644 --- a/modules/openstack_project/templates/logs-dev.vhost.erb +++ b/modules/openstack_project/templates/logs-dev.vhost.erb @@ -29,12 +29,33 @@ NameVirtualHost <%= vhost_name %>:<%= port %> 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> RewriteEngine On # rewrite all txt.gz files to map to our internal htmlify wsgi app diff --git a/modules/openstack_project/templates/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb index d45669b7d6..504144a07f 100644 --- a/modules/openstack_project/templates/logs.vhost.erb +++ b/modules/openstack_project/templates/logs.vhost.erb @@ -27,12 +27,33 @@ NameVirtualHost <%= vhost_name %>:<%= port %> 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