From 73dc45da352ac84675c0477549bf8c15a847a658 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 17 Jul 2015 14:26:17 +0000
Subject: [PATCH] Clean up logserver vhost templates

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
---
 templates/logs-dev.vhost.erb | 27 ++++++++-------------------
 templates/logs.vhost.erb     | 14 --------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/templates/logs-dev.vhost.erb b/templates/logs-dev.vhost.erb
index 48d6e1b..3f9e125 100644
--- a/templates/logs-dev.vhost.erb
+++ b/templates/logs-dev.vhost.erb
@@ -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]
 
diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb
index 9b9b915..3f9e125 100644
--- a/templates/logs.vhost.erb
+++ b/templates/logs.vhost.erb
@@ -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