From 8fcdb2327c8ff61810fa784f19cf0ff0eb57dfd9 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Wed, 22 May 2013 13:14:57 +0200
Subject: [PATCH] Switch status.o.o/release to local instance

Serve status.o.o/release from the local releasestatus
deployment, now that we validated that everything works from
http://status.openstack.org/release.new

Once this merges, I'll manually remove the old-wiki.o.o deployment.

Change-Id: I0c676e3a68bb7ca5cf10899d65eefdb318f66948
Reviewed-on: https://review.openstack.org/30092
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/openstack_project/templates/status.vhost.erb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index 476f89dd83..96d434e83c 100644
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@@ -21,13 +21,6 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
     Allow from all
   </Location>
 
-  RewriteRule ^/release$ /release/ [R]
-  RewriteRule ^/release/(.*)$ http://old-wiki.openstack.org/release/$1 [P]
-  <Location /release/>
-    Order allow,deny
-    Allow from all
-  </Location>
-
   RewriteRule ^/bugday$ /bugday/ [R]
   RewriteRule ^/bugday/(.*)$ http://old-wiki.openstack.org/bugday/$1 [P]
   <Location /bugday/>
@@ -36,7 +29,7 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
   </Location>
 
   Alias /reviews /srv/static/reviewday
-  Alias /release.new /srv/static/release
+  Alias /release /srv/static/release
 
   <Directory <%= docroot %>>
     Options <%= options %>