From c96a80d481ace9de68c3bdb34aaaf3eebc1e0137 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 31 Jul 2020 11:22:00 -0700 Subject: [PATCH] Cleanup /p/ further and add reminder comments We remove old git web server env vars from the apache config and add comments to our /p/ handling to describe the need for further cleanup when Gerrit is upgraded. Change-Id: I79fc130dec0a8b00706c0ec0f8fcab4d867e34d1 --- playbooks/roles/gerrit/templates/gerrit.vhost.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/gerrit/templates/gerrit.vhost.j2 b/playbooks/roles/gerrit/templates/gerrit.vhost.j2 index 817e1f2420..94e5e615d0 100644 --- a/playbooks/roles/gerrit/templates/gerrit.vhost.j2 +++ b/playbooks/roles/gerrit/templates/gerrit.vhost.j2 @@ -55,6 +55,8 @@ ProxyPreserveHost on ProxyStatus On + # TODO remove this when upgrading to Gerrit 2.16. /p/ is used + # for project dashboards. ProxyPassMatch ^/p/ ! ProxyPassMatch ^/robots.txt$ ! ProxyPassMatch ^/server-status ! @@ -63,9 +65,8 @@ Alias /robots.txt /home/gerrit2/review_site/static/robots.txt - SetEnv GIT_PROJECT_ROOT /opt/lib/git - SetEnv GIT_HTTP_EXPORT_ALL - + # TODO remove this when upgrading to Gerrit 2.16. /p/ is used + # for project dashboards. RewriteRule "^/p/.*" "-" [F,L]