From 9b357c31fb247b7ec27824f490f050722a3d719c Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Wed, 25 Jun 2014 09:17:39 -0400
Subject: [PATCH] remove /rechecks

and make it redirect to the elastic-recheck page for niceness to
users using the old link.

Change-Id: I900418ae152c5568c7418237aa0e30e2b1efdd78
---
 modules/openstack_project/templates/status.vhost.erb | 10 +---------
 modules/zuul/templates/zuul.vhost.erb                |  3 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index 3071d63921..5fb001e0c9 100644
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@@ -12,15 +12,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
 <% end -%>
   DocumentRoot <%= docroot %>
 
-  RewriteEngine on
-
-  RewriteRule ^/rechecks$ /rechecks/ [R]
-  RewriteRule ^/rechecks/$ http://zuul.openstack.org/rechecks.html [P]
-  <Location /rechecks/>
-    Order allow,deny
-    Allow from all
-  </Location>
-
   Alias /bugday /srv/static/bugdaystats
   <Directory /srv/static/bugdaystats>
       AllowOverride None
@@ -54,6 +45,7 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
       allow from all
   </Directory>
 
+  RedirectMatch permanent ^/rechecks(.*) /elastic-recheck
   Alias /elastic-recheck /usr/local/share/elastic-recheck
   <Directory /usr/local/share/elastic-recheck>
       AllowOverride None
diff --git a/modules/zuul/templates/zuul.vhost.erb b/modules/zuul/templates/zuul.vhost.erb
index 9e50ffa03e..ba31723b34 100644
--- a/modules/zuul/templates/zuul.vhost.erb
+++ b/modules/zuul/templates/zuul.vhost.erb
@@ -13,9 +13,6 @@
 
   AddOutputFilterByType DEFLATE application/json
 
-  Alias /rechecks.html /var/www/recheckwatch/rechecks.html
-  Alias /rechecks /var/www/recheckwatch/rechecks.html
-
   SetEnv GIT_PROJECT_ROOT /var/lib/zuul/git/
   SetEnv GIT_HTTP_EXPORT_ALL