opendev/puppet-openstackci
Code Issues Proposed changes

Clean up logserver vhost templates

Browse Source 
Remove some old path patterns which are a year past their expiration
date, and also sync up the logs-dev template comments to match the
production version (for ease of diffing).

Change-Id: Ibfd4fc1b16c3eac2c6093f1b031bf7ae237eaf04
This commit is contained in:
Jeremy Stanley
2015-07-17 14:26:17 +00:00
parent ed0243fe25
commit 73dc45da35
2 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
templates/logs-dev.vhost.erb
View File

@@ -48,26 +48,15 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
ReadmeName /help/tempest-logs.html
</Directory>
# old patterns, can be removed in July 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
# PT, Pass-through: to come back around and get picked up by the WSGIScriptAlias
# NS, No-subrequest: on coming back through, mod-autoindex may have added index.html
# which would match the !-f condition. We therefore ensure the
# rewrite doesn't trigger by disallowing subrequests.
# rewrite txt.gz & console.html[.gz] files to map to our internal htmlify
# wsgi app
# PT, Pass-through: to come back around and get picked up by the
# WSGIScriptAlias
# NS, No-subrequest: on coming back through, mod-autoindex may have added
# index.html which would match the !-f condition. We
# therefore ensure the rewrite doesn't trigger by
# disallowing subrequests.
RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT,NS]
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT,NS]

14
templates/logs.vhost.erb
View File

@@ -48,20 +48,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
ReadmeName /help/tempest-logs.html
</Directory>
# old patterns, can be removed in July 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 txt.gz & console.html[.gz] files to map to our internal htmlify
# wsgi app