From 7cffca4416c814c6826a65e45773790d7aeff6fc Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 26 Aug 2014 13:04:29 +0200 Subject: [PATCH] Add satellites timeout option. --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 1 + files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 61ef417..9a69942 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -101,6 +101,7 @@ default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil default['gitlab']['gitlab-rails']['omniauth_providers'] = [] default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites" +default['gitlab']['gitlab-rails']['satellites_timeout'] = nil default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups" default['gitlab']['gitlab-rails']['backup_keep_time'] = nil default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/" diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index fc1b470..14fcf49 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -218,7 +218,7 @@ production: &base satellites: # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) path: <%= @satellites_path %> - timeout: 30 + timeout: <%= @satellites_timeout %> ## Backup settings backup: -- libgit2 0.21.2