codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'environment-smtp-verify' of https://github.com/cfstras/discourse

Browse source
This commit is contained in:
Sam 2014-05-14 11:25:05 +10:00
commit 810eda448f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/discourse_defaults.conf
View file

@ -63,6 +63,10 @@ smtp_authentication = plain
# enable TLS encryption for smtp connections
smtp_enable_start_tls = true
# mode for verifying smtp server certificates
# to disable, set to 'none'
smtp_openssl_verify_mode =
# enable MiniProfiler for administrators
enable_mini_profiler = true

3
config/environments/production.rb
View file

@ -36,7 +36,8 @@ Discourse::Application.configure do
user_name: GlobalSetting.smtp_user_name,
password: GlobalSetting.smtp_password,
authentication: GlobalSetting.smtp_authentication,
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls,
openssl_verify_mode: GlobalSetting.smtp_openssl_verify_mode
}
config.action_mailer.smtp_settings = settings.reject{|x,y| y.nil?}