Add timeouts.

attributes/default.rb

@@ -27,6 +27,7 @@ default['gitlab']['home'] = "/home/git"
 # GitLab hq
 default['gitlab']['path'] = "#{node['gitlab']['home']}/gitlab" # Do not change this attribute in production unless you know what you do since some code from the GitLab repo such as init.d assume this path.
 default['gitlab']['satellites_path'] = "#{node['gitlab']['home']}/gitlab-satellites"
+default['gitlab']['satellites_timeout'] = 30
 # GitLab shell
 default['gitlab']['shell_repository'] = "https://github.com/gitlabhq/gitlab-shell.git"
@@ -68,6 +69,7 @@ default['gitlab']['email_from'] = "gitlab@localhost"
 default['gitlab']['support_email'] = "support@localhost"
 default['gitlab']['max_size'] = "20971520" # 20.megabytes
+default['gitlab']['git_timeout'] = 10
 default['gitlab']['signup_enabled'] = false
 default['gitlab']['signin_enabled'] = true
 default['gitlab']['projects_limit'] = 10

recipes/install.rb

@@ -17,7 +17,9 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
     :email_from => gitlab['email_from'],
     :support_email => gitlab['support_email'],
     :max_size => gitlab['max_size'],
+    :git_timeout => gitlab['git_timeout'],
     :satellites_path => gitlab['satellites_path'],
+    :satellites_timeout => gitlab['satellites_timeout'],
     :repos_path => gitlab['repos_path'],
     :shell_path => gitlab['shell_path'],
     :signup_enabled => gitlab['signup_enabled'],

spec/install_spec.rb

@@ -22,7 +22,9 @@ describe "gitlab::install" do
             email_from: 'gitlab@localhost',
             support_email: 'support@localhost',
             max_size: '20971520',
+            git_timeout: 10,
             satellites_path: '/home/git/gitlab-satellites',
+            satellites_timeout: 30,
             repos_path: '/home/git/repositories',
             shell_path: '/home/git/gitlab-shell',
             signup_enabled: false,
@@ -456,7 +458,9 @@ describe "gitlab::install" do
             email_from: 'gitlab@localhost',
             support_email: 'support@localhost',
             max_size: '20971520',
+            git_timeout: 10,
             satellites_path: '/home/git/gitlab-satellites',
+            satellites_timeout: 30,
             repos_path: '/home/git/repositories',
             shell_path: '/home/git/gitlab-shell',
             signup_enabled: false,

templates/default/gitlab.yml.erb

@@ -177,8 +177,6 @@ production: &base
     #
     sync_ssh_keys: <%= @ldap_config['sync_ssh_keys'] %>
-
-
   ## OmniAuth settings
   omniauth:
     # Allow login via Twitter, Google, etc. using OmniAuth providers
@@ -211,7 +209,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:
@@ -243,7 +241,7 @@ production: &base
     # This value can be increased if you have very large commits
     max_size: <%= @max_size %>
     # Git timeout to read a commit, in seconds
-    timeout: 10
+    timeout: <%= @git_timeout %>
   #
   # 4. Extra customization