From 07537faca72e2475a25e1e73c12bc924499afc27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayrton=20Ara=C3=BAjo?= Date: Tue, 15 Jul 2014 14:27:35 -0400 Subject: Add support to set satellites timeout --- config/gitlab.yml.example | 1 + config/initializers/1_settings.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'config') 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 -- cgit v1.2.1