From 2c5f820e5ab4d7a7a11846fda5591685671142f9 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Wed, 19 Dec 2012 16:48:51 -0800
Subject: [PATCH] Fix rechecks.html URL on zuul.o.o.
Change-Id: Icb504f56499651388c6dd4ba720bd55a93602322
Reviewed-on: https://review.openstack.org/18449
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
modules/zuul/templates/zuul.vhost.erb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/zuul/templates/zuul.vhost.erb b/modules/zuul/templates/zuul.vhost.erb
index 1690f95aed..74861005da 100644
--- a/modules/zuul/templates/zuul.vhost.erb
+++ b/modules/zuul/templates/zuul.vhost.erb
@@ -9,14 +9,13 @@
RewriteEngine on
RewriteRule /zuul/status http://127.0.0.1:8001/status [P]
- RewriteCond %{REQUEST_URI} !^/p/
- RewriteRule / http://127.0.0.1:8001/status [P]
+ RewriteRule ^/$ http://127.0.0.1:8001/status [P]
+
+ Alias /rechecks.html /var/www/recheckwatch/rechecks.html
SetEnv GIT_PROJECT_ROOT /var/lib/zuul/git/
SetEnv GIT_HTTP_EXPORT_ALL
- Alias /rechecks.html /var/www/recheckwatch/rechecks.html
-
AliasMatch ^/p/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/lib/zuul/git/$1
AliasMatch ^/p/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/lib/zuul/git/$1
ScriptAlias /p/ /usr/lib/git-core/git-http-backend/