From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Apr 2020 21:01:27 +0000 (+0100)
Subject: Pass Git-Protocol header to git-http-backend
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/b29516c0cce8ee5080beb5f1e4c15622444f18ed

Pass Git-Protocol header to git-http-backend
---

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 78c1b828a..5ee3686d8 100644
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -20,6 +20,7 @@
 node.default[:accounts][:users][:git][:status] = :role
 
 include_recipe "accounts"
+include_recipe "apt"
 include_recipe "networking"
 
 git_directory = node[:git][:directory]
diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index bc711738c..30685fad9 100644
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -48,6 +48,8 @@
         SetEnv GIT_HTTP_EXPORT_ALL
         SetEnv GIT_HTTP_MAX_REQUEST_BUFFER 100M
 
+        SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
+
         # KeepaliveTimeout longer than git config uploadpack.keepalive 5 second default
         KeepAliveTimeout 20