From 62690de25f45cfed3e18d6ac2e7cb210dcae312b Mon Sep 17 00:00:00 2001
From: ngentile <ngentile@arbor.net>
Date: Wed, 22 Apr 2015 17:57:02 -0400
Subject: [PATCH] add GITLAB_SATELLITES_TIMEOUT configuration parameter
 (default: 30s)

---
 README.md                         | 1 +
 assets/config/gitlabhq/gitlab.yml | 2 +-
 assets/init                       | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 487bc9be..ffc1ecb0 100644
--- a/README.md
+++ b/README.md
@@ -732,6 +732,7 @@ Below is the complete list of available options that can be used to customize yo
 - **GITLAB_PROJECTS_SNIPPETS**: Set if *snippets* feature should be enabled by default for new projects. Defaults is `false`.
 - **GITLAB_PROJECTS_VISIBILITY**: Set default projects visibility level. Possible values `public`, `private` and `internal`. Defaults to `private`.
 - **GITLAB_WEBHOOK_TIMEOUT**: Sets the timeout for webhooks. Defaults to `10` seconds.
+- **GITLAB_SATELLITES_TIMEOUT**: Sets the timeout for satellites. Defaults to `30` seconds.
 - **GITLAB_BACKUP_DIR**: The backup folder in the container. Defaults to `/home/git/data/backups`
 - **GITLAB_BACKUPS**: Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default
 - **GITLAB_BACKUP_EXPIRY**: Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds).
diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml
index 16c432aa..c71b89b1 100644
--- a/assets/config/gitlabhq/gitlab.yml
+++ b/assets/config/gitlabhq/gitlab.yml
@@ -243,7 +243,7 @@ production: &base
   satellites:
     # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
     path: "{{GITLAB_DATA_DIR}}/gitlab-satellites/"
-    timeout: 30
+    timeout: {{GITLAB_SATELLITES_TIMEOUT}}
 
   ## Backup settings
   backup:
diff --git a/assets/init b/assets/init
index 8427e63f..86bf687b 100755
--- a/assets/init
+++ b/assets/init
@@ -30,6 +30,7 @@ GITLAB_PROJECTS_SNIPPETS=${GITLAB_PROJECTS_SNIPPETS:-false}
 GITLAB_PROJECTS_VISIBILITY=${GITLAB_PROJECTS_VISIBILITY:-private}
 GITLAB_RELATIVE_URL_ROOT=${GITLAB_RELATIVE_URL_ROOT:-}
 GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10}
+GITLAB_SATELLITES_TIMEOUT=${GITLAB_SATELLITES_TIMEOUT:-30}
 
 SSL_SELF_SIGNED=${SSL_SELF_SIGNED:-false}
 SSL_CERTIFICATE_PATH=${SSL_CERTIFICATE_PATH:-$GITLAB_DATA_DIR/certs/gitlab.crt}
@@ -422,6 +423,9 @@ sudo -u git -H sed 's/{{GITLAB_PROJECTS_VISIBILITY}}/'"${GITLAB_PROJECTS_VISIBIL
 # configure gitlab webhook timeout
 sudo -u git -H sed 's/{{GITLAB_WEBHOOK_TIMEOUT}}/'"${GITLAB_WEBHOOK_TIMEOUT}"'/' -i config/gitlab.yml
 
+# configure gitlab webhook timeout
+sudo -u git -H sed 's/{{GITLAB_SATELLITES_TIMEOUT}}/'"${GITLAB_SATELLITES_TIMEOUT}"'/' -i config/gitlab.yml
+
 # configure database
 if [ "${DB_TYPE}" == "postgres" ]; then
   sudo -u git -H sed 's/{{DB_ADAPTER}}/postgresql/' -i config/database.yml