Merge remote-tracking branch 'github/pull/451'

[chef.git] / cookbooks / git / templates / default / apache.erb

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index 5aa08f465434944c4eddaba8a5acc675385d46d9..30685fad936f7f76446b593092c4e9c9943554a2 100644 (file)
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -46,9 +46,12 @@
 
         SetEnv GIT_PROJECT_ROOT /var/lib/git
         SetEnv GIT_HTTP_EXPORT_ALL
 
         SetEnv GIT_PROJECT_ROOT /var/lib/git
         SetEnv GIT_HTTP_EXPORT_ALL

+        SetEnv GIT_HTTP_MAX_REQUEST_BUFFER 100M

 
 

-        # Keepalive should be larger than git config uploadpack.keepalive to avoid potential race on slower links
-        KeepAliveTimeout 60
+        SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
+
+        # KeepaliveTimeout longer than git config uploadpack.keepalive 5 second default
+        KeepAliveTimeout 20

 
         ScriptAlias /public /usr/lib/git-core/git-http-backend/public
         ScriptAlias /private /usr/lib/git-core/git-http-backend/private
 
         ScriptAlias /public /usr/lib/git-core/git-http-backend/public
         ScriptAlias /private /usr/lib/git-core/git-http-backend/private


@@ -59,10 +62,12 @@
         <Location />
                   Require all granted
         </Location>
         <Location />
                   Require all granted
         </Location>

+<% unless @private_allowed.empty? -%>

 
         <Location /private>
                   Require ip <%= @private_allowed.sort.join(" ") %>
         </Location>
 
         <Location /private>
                   Require ip <%= @private_allowed.sort.join(" ") %>
         </Location>

+<% end -%>

 
         <Location /private/chef.git>
                   Require all denied
 
         <Location /private/chef.git>
                   Require all denied