Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 9a3ce5f54f 6d50504a83
commit d3c223e464
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/discourse_defaults.conf
View File

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

2
config/environments/production.rb
View File

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