opendev/system-config
Code Issues Proposed changes

Fix logs rewrite passthrough

Browse Source 
The logs vhost rewrite rules were passing through and failing matches
because of apache2's internal rewrites. Stopping passing through to
avoid apache2 breaking us.

Change-Id: I86fafad9a0c991f00a86c042ff1174ca2ccd8c4d
This commit is contained in:
Clark Boylan 2014-07-16 05:32:19 -07:00
parent a1953fd4ae
commit d65853f8da
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openstack_project/templates/logs-dev.vhost.erb
View File

@ -67,7 +67,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-d
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-l
RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L,PT]
RewriteCond %{REQUEST_FILENAME} !^/icon
RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L]
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py

3
modules/openstack_project/templates/logs.vhost.erb
View File

@ -67,7 +67,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-d
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-l
RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L,PT]
RewriteCond %{REQUEST_FILENAME} !^/icon
RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L]
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py