Merge branch 'incoming_email_start_tls_config' into 'master'

Add incoming email start tls config option.

Part of gitlab-org/gitlab-ce!1424

See merge request !493

files/gitlab-config-template/gitlab.rb.template

@@ -40,6 +40,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['incoming_email_host'] = "imap.gmail.com" # IMAP server host
 # gitlab_rails['incoming_email_port'] = 993 # IMAP server port
 # gitlab_rails['incoming_email_ssl'] = true # Whether the IMAP server uses SSL
+# gitlab_rails['incoming_email_start_tls'] = false # Whether the IMAP server uses StartTLS
 # gitlab_rails['incoming_email_email'] = "incoming@gitlab.example.com"  # Email account username. Usually the full email address.
 # gitlab_rails['incoming_email_password'] = "password" # Email account password
 # gitlab_rails['incoming_email_mailbox_name'] = "inbox" # The name of the mailbox where incoming mail will end up.

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

@@ -90,6 +90,7 @@ default['gitlab']['gitlab-rails']['incoming_email_address'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_host'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_port'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_ssl'] = nil
+default['gitlab']['gitlab-rails']['incoming_email_start_tls'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_email'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_log_directory'] = "/var/log/gitlab/mailroom"
 default['gitlab']['gitlab-rails']['ldap_enabled'] = false

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

@@ -6,6 +6,8 @@
     :port: <%= @incoming_email_port %>
     # Whether the IMAP server uses SSL
     :ssl: <%= @incoming_email_ssl %>
+    # Whether the IMAP server uses StartTLS
+    :start_tls: <%= @incoming_email_start_tls %>
     # Email account username. Usually the full email address.
     :email: <%= @incoming_email_email %>
     # Email account password