opendev/system-config
Code Issues Proposed changes

Merge "Additional path patterns for log readme files."

Browse Source
This commit is contained in:
Jenkins 2013-08-01 20:27:29 +00:00 committed by Gerrit Code Review
commit 4b176b783d
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