Revert "Allow to configure smtp and sendmail in gitlab.yml"

4 files changed, 27 insertions, 28 deletions

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ce0023e0795..e5ac66a2323 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -105,6 +105,10 @@ Settings.gitlab['https']        = false if Settings.gitlab['https'].nil?
 Settings.gitlab['port']       ||= Settings.gitlab.https ? 443 : 80
 Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
 Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
+Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil?
+Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
+Settings.gitlab['email_display_name'] ||= "GitLab"
+Settings.gitlab['email_reply_to'] ||= "noreply@#{Settings.gitlab.host}"
 Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'git'
 Settings.gitlab['user_home']  ||= begin
@@ -131,26 +135,6 @@ Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitla
 Settings.gitlab['restricted_signup_domains'] ||= []
 
 #
-# Outgoing emails
-#
-Settings['outgoing_emails'] ||= Settingslogic.new({})
-Settings['outgoing_emails'].tap do |opts|
-  # For backward compatibility. TODO remove in next major release.
-  opts['enabled'] ||= Settings.gitlab['email_enabled']
-  opts['from'] ||= Settings.gitlab['email_from']
-  opts['display_name'] ||= Settings.gitlab['display_name']
-  opts['reply_to'] ||= Settings.gitlab['email_reply_to']
-
-  opts['enabled'] ||= opts['enabled'].nil?
-  opts['display_name'] ||= "GitLab"
-  opts['from'] ||= "gitlab@#{Settings.gitlab.host}"
-  opts['reply_to'] ||= "noreply@#{Settings.gitlab.host}"
-  opts['delivery_method'] ||= :sendmail
-  opts['sendmail_settings'] ||= {}
-  opts['smtp_settings'] ||= {}
-end
-
-#
 # Gravatar
 #
 Settings['gravatar'] ||= Settingslogic.new({})
diff --git a/config/initializers/disable_email_interceptor.rb b/config/initializers/disable_email_interceptor.rb
index 122a5829916..c76a6b8b19f 100644
--- a/config/initializers/disable_email_interceptor.rb
+++ b/config/initializers/disable_email_interceptor.rb
@@ -1,4 +1,2 @@
 # Interceptor in lib/disable_email_interceptor.rb
-unless Gitlab.config.outgoing_emails.enabled
-  ActionMailer::Base.register_interceptor(DisableEmailInterceptor)
-end
+ActionMailer::Base.register_interceptor(DisableEmailInterceptor) unless Gitlab.config.gitlab.email_enabled
diff --git a/config/initializers/email_settings.rb b/config/initializers/email_settings.rb
deleted file mode 100644
index 99cb09ebfd0..00000000000
--- a/config/initializers/email_settings.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Gitlab.config.outgoing_emails.tap do |c|
-  Gitlab::Application.config.action_mailer.delivery_method = c.delivery_method
-  ActionMailer::Base.smtp_settings = c.smtp_settings.symbolize_keys
-  ActionMailer::Base.sendmail_settings = c.sendmail_settings.symbolize_keys
-end
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
new file mode 100644
index 00000000000..f0fe2fdfa43
--- /dev/null
+++ b/config/initializers/smtp_settings.rb.sample
@@ -0,0 +1,22 @@
+# To enable smtp email delivery for your GitLab instance do the following:
+# 1. Rename this file to smtp_settings.rb
+# 2. Edit settings inside this file
+# 3. Restart GitLab instance
+#
+# For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
+#
+
+if Rails.env.production?
+  Gitlab::Application.config.action_mailer.delivery_method = :smtp
+
+  ActionMailer::Base.smtp_settings = {
+    address: "email.server.com",
+    port: 456,
+    user_name: "smtp",
+    password: "123456",
+    domain: "gitlab.company.com",
+    authentication: :login,
+    enable_starttls_auto: true,
+    openssl_verify_mode: 'peer' # See ActionMailer documentation for other possible options
+  }
+end