From: Grant <git@firefishy.com>
Date: Sat, 22 Feb 2020 21:13:04 +0000 (+0000)
Subject: Merge pull request #276 from Firefishy/git-timeout-tweak
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/85b17e5bb5c6e47ed9bfbf57b9c3e6d68d3437ea?hp=2f3b011059e99fc2069683e1291e26e30de32ca2

Merge pull request #276 from Firefishy/git-timeout-tweak

git: tweak description for apache keepalive timeout
---

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index 5aa08f465..39a680120 100644
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -47,8 +47,8 @@
         SetEnv GIT_PROJECT_ROOT /var/lib/git
         SetEnv GIT_HTTP_EXPORT_ALL
 
-        # Keepalive should be larger than git config uploadpack.keepalive to avoid potential race on slower links
-        KeepAliveTimeout 60
+        # 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