Merge pull request #1791 from vikhyat/smtp-auth-option

Make SMTP authentication mechanism configurable.
This commit is contained in:
Régis Hanol 2014-01-06 05:28:21 -08:00
commit d3c223e464
2 changed files with 4 additions and 1 deletions

View file

@ -56,6 +56,9 @@ smtp_user_name =
# password for smtp server
smtp_password =
# smtp authentication mechanism
smtp_authentication = plain
# enable TLS encryption for smtp connections
smtp_enable_start_tls = true

View file

@ -39,7 +39,7 @@ Discourse::Application.configure do
domain: GlobalSetting.smtp_domain,
user_name: GlobalSetting.smtp_user_name,
password: GlobalSetting.smtp_password,
authentication: 'plain',
authentication: GlobalSetting.smtp_authentication,
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
}