From 1d475e5066342da04bd5492a70ad38ecdb02396f Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 22 Jun 2018 00:32:31 +0100
Subject: [PATCH] Serve private git repositories with git-http-backend

---
 cookbooks/chef/templates/default/apache.erb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 4f57bba7d..706ab5ead 100644
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -19,8 +19,6 @@
 	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
-	DocumentRoot /var/lib/git
-
 	SSLEngine on
 	SSLProxyEngine on
 	SSLCertificateFile /etc/ssl/certs/chef.openstreetmap.org.pem
@@ -29,8 +27,13 @@
 	ProxyPassMatch ^/.*\.git/ !
 	ProxyPass / https://<%= node[:fqdn] %>:4443/
 	ProxyPreserveHost on
+
+	SetEnv GIT_PROJECT_ROOT /var/lib/git
+	SetEnv GIT_HTTP_EXPORT_ALL
+	ScriptAlias / /usr/lib/git-core/git-http-backend/
 </VirtualHost>
 
-<Directory /var/lib/git>
+<Directory /usr/lib/git-core>
+	Options ExecCGI
 	Require ip <%= @git_allowed.sort.join(" ") %>
 </Directory>
-- 
2.43.2