From d65853f8dafd65df9f05423c3e26ba666f37382c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 16 Jul 2014 05:32:19 -0700 Subject: [PATCH] Fix logs rewrite passthrough 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 --- modules/openstack_project/templates/logs-dev.vhost.erb | 3 ++- modules/openstack_project/templates/logs.vhost.erb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/templates/logs-dev.vhost.erb b/modules/openstack_project/templates/logs-dev.vhost.erb index 8cc5833134..0b5827b1a4 100644 --- a/modules/openstack_project/templates/logs-dev.vhost.erb +++ b/modules/openstack_project/templates/logs-dev.vhost.erb @@ -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 diff --git a/modules/openstack_project/templates/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb index 8cc5833134..0b5827b1a4 100644 --- a/modules/openstack_project/templates/logs.vhost.erb +++ b/modules/openstack_project/templates/logs.vhost.erb @@ -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