Pass Git-Protocol header to git-http-backend

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 78c1b828afa06fc2b9c8b84b70c45902e89591c3..5ee3686d87702e5956a7d71bcbc0377a45833c1f 100644 (file)
--- 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 bc711738c75d0d6d48b2086db24cfd5f4dcbc3de..30685fad936f7f76446b593092c4e9c9943554a2 100644 (file)
--- 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