Merge branch 'mailroom-idle-timeout' into 'master'

Extract mailroom idle timeout to an attribute

I'm adding this so we can play with the mailroom idle_timeout that locks when we try to make it hung up.

I'm not certain if this is the way to do it, so I'm open for corrections and or to redo the work completely.

I couldn't find any spec to add on this, so I took the quick path.

cc/ @marin

See merge request !1087

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -116,6 +116,7 @@ default['gitlab']['gitlab-rails']['incoming_email_start_tls'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_email'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_password'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_mailbox_name'] = "inbox"
+default['gitlab']['gitlab-rails']['incoming_email_idle_timeout'] = nil
 default['gitlab']['gitlab-rails']['artifacts_enabled'] = true
 default['gitlab']['gitlab-rails']['artifacts_path'] = nil
 default['gitlab']['gitlab-rails']['lfs_enabled'] = nil

files/gitlab-cookbooks/gitlab/files/default/mail_room.yml

@@ -12,7 +12,7 @@
     :start_tls: <%= config[:start_tls].to_json %>
     :email: <%= config[:user].to_json %>
     :password: <%= config[:password].to_json %>
-    :idle_timeout: 60
+    :idle_timeout: <%= config[:idle_timeout].to_json %>
 
     :name: <%= config[:mailbox].to_json %>
 

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -113,6 +113,8 @@ production: &base
 
     # The mailbox where incoming mail will end up. Usually "inbox".
     mailbox: <%= single_quote(@incoming_email_mailbox_name) %>
+    # The IDLE command timeout.
+    idle_timeout: <%= @incoming_email_idle_timeout %>
 
   ## Build Artifacts
   artifacts: