From: Grant Slater <git@firefishy.com>
Date: Sat, 22 Feb 2020 00:09:24 +0000 (+0000)
Subject: git: add potential workaround of keepalive race
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/285e9901c691d922b8e3adaff28ec6604cd7e999

git: add potential workaround of keepalive race
---

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index 9ec36f7d8..5aa08f465 100644
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -47,6 +47,9 @@
         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
+
         ScriptAlias /public /usr/lib/git-core/git-http-backend/public
         ScriptAlias /private /usr/lib/git-core/git-http-backend/private
         Alias /gitweb /usr/share/gitweb