From fededacaf0363478f2f98d2b055fccd97c4aa763 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Wed, 30 Sep 2015 11:42:04 +1000 Subject: [PATCH] Handle all requests through os-loganalyze os-loganalyze now has the ability to provide indexes for both on disk and in swift files. Handle all requests through osloganalyze so that paths containing both disk and swift files can have all of their assets listed. Change-Id: I495ce20d56b04fdc5c2051f2bbcb834049ac6bda --- templates/logs-dev.vhost.erb | 16 ---------------- templates/logs.vhost.erb | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/templates/logs-dev.vhost.erb b/templates/logs-dev.vhost.erb index 3f9e125..d71be58 100644 --- a/templates/logs-dev.vhost.erb +++ b/templates/logs-dev.vhost.erb @@ -49,22 +49,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> RewriteEngine On - # 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] - - # Check if the request exists as a file, directory or symbolic link - # If not, write the request to htmlify to see if we can fetch from swift - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-d - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-l RewriteCond %{REQUEST_FILENAME} !^/icon RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L,PT,NS] diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb index 3f9e125..d71be58 100644 --- a/templates/logs.vhost.erb +++ b/templates/logs.vhost.erb @@ -49,22 +49,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> RewriteEngine On - # 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] - - # Check if the request exists as a file, directory or symbolic link - # If not, write the request to htmlify to see if we can fetch from swift - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-d - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-l RewriteCond %{REQUEST_FILENAME} !^/icon RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L,PT,NS]