opendev/system-config
Code Issues Proposed changes

Cleanup /p/ further and add reminder comments

Browse Source 
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
This commit is contained in:
Clark Boylan 2020-07-31 11:22:00 -07:00
parent 770dbad2dd
commit c96a80d481
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/gerrit/templates/gerrit.vhost.j2
View File

@ -55,6 +55,8 @@
ProxyPreserveHost on ProxyPreserveHost on
ProxyStatus On ProxyStatus On
# TODO remove this when upgrading to Gerrit 2.16. /p/ is used
# for project dashboards.
ProxyPassMatch ^/p/ ! ProxyPassMatch ^/p/ !
ProxyPassMatch ^/robots.txt$ ! ProxyPassMatch ^/robots.txt$ !
ProxyPassMatch ^/server-status ! ProxyPassMatch ^/server-status !
@ -63,9 +65,8 @@
Alias /robots.txt /home/gerrit2/review_site/static/robots.txt Alias /robots.txt /home/gerrit2/review_site/static/robots.txt
SetEnv GIT_PROJECT_ROOT /opt/lib/git # TODO remove this when upgrading to Gerrit 2.16. /p/ is used
SetEnv GIT_HTTP_EXPORT_ALL # for project dashboards.
RewriteRule "^/p/.*" "-" [F,L] RewriteRule "^/p/.*" "-" [F,L]
<Directory /home/gerrit2/review_site/git/> <Directory /home/gerrit2/review_site/git/>