summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAyrton Araújo <root@ayrtonaraujo.net>2014-07-15 14:27:35 -0400
committerAyrton Araújo <root@ayrtonaraujo.net>2014-07-21 11:50:29 -0400
commit07537faca72e2475a25e1e73c12bc924499afc27 (patch)
treec0a3363962b31fd35b85b2a66a74bcc774bb45e5 /config
parenta6546f51e2a383d812dd633166447f6758bd9bdb (diff)
downloadgitlab-ce-07537faca72e2475a25e1e73c12bc924499afc27.tar.gz
Add support to set satellites timeout
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example1
-rw-r--r--config/initializers/1_settings.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 9b46aa07a56..fd0641f20fe 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -197,6 +197,7 @@ production: &base
satellites:
# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/git/gitlab-satellites/
+ timeout: 30
## Backup settings
backup:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 0480ec8ecfd..49e35d5bb68 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -139,6 +139,7 @@ Settings.git['timeout'] ||= 10
Settings['satellites'] ||= Settingslogic.new({})
Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root)
+Settings.satellites['timeout'] ||= 30
#
# Extra customization