Download as
Browse Code »

Commit 0d9abc1a2057e040a60bc7c8a1853935aa6a6728

Authored by Jacob Vosmaer
2 parents 98024957 7cffca44
Exists in master

Merge branch 'satellites_timeout' into 'master' 

Satellites timeout option

Fixes #226

See merge request !194
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @0d9abc1
@@ -101,6 +101,7 @@ default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil @@ -101,6 +101,7 @@ default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil
101 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil 101 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil
102 default['gitlab']['gitlab-rails']['omniauth_providers'] = [] 102 default['gitlab']['gitlab-rails']['omniauth_providers'] = []
103 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites" 103 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
  104 +default['gitlab']['gitlab-rails']['satellites_timeout'] = nil
104 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups" 105 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
105 default['gitlab']['gitlab-rails']['backup_keep_time'] = nil 106 default['gitlab']['gitlab-rails']['backup_keep_time'] = nil
106 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/" 107 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @0d9abc1
@@ -218,7 +218,7 @@ production: &base @@ -218,7 +218,7 @@ production: &base
218 satellites: 218 satellites:
219 # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) 219 # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
220 path: <%= @satellites_path %> 220 path: <%= @satellites_path %>
221 - timeout: 30 221 + timeout: <%= @satellites_timeout %>
222 222
223 ## Backup settings 223 ## Backup settings
224 backup: 224 backup: