From 6bc14d003204a7fbb5b2a79e574b3ecf1c5ea8c1 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 18 Jan 2013 21:28:34 +0000
Subject: [PATCH] Don't proxy Gerrit's fake contactstore.
* modules/gerrit/templates/gerrit.vhost.erb: If the contactstore
feature is enabled, don't shadow the URL to the fakestore CGI with
the Gerrit loopback proxy.
Change-Id: Ic6d01d671b762370b91f732c1a980051cdb5f6c2
Reviewed-on: https://review.openstack.org/20053
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
modules/gerrit/templates/gerrit.vhost.erb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/gerrit/templates/gerrit.vhost.erb b/modules/gerrit/templates/gerrit.vhost.erb
index 459478b257..b26ef57aee 100644
--- a/modules/gerrit/templates/gerrit.vhost.erb
+++ b/modules/gerrit/templates/gerrit.vhost.erb
@@ -48,6 +48,9 @@
RewriteRule ^.*$ <%= scope.lookupvar("gerrit::canonicalweburl") %>
<% if scope.lookupvar("gerrit::replicate_local") -%>
RewriteCond %{REQUEST_URI} !^/p/
+<% end -%>
+<% if scope.lookupvar("gerrit::contactstore") == true -%>
+ RewriteCond %{REQUEST_URI} !^/fakestore$
<% end -%>
RewriteRule ^/(.*)$ http://localhost:8081/$1 [P]