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

strip out nil settings from config

Browse source
This commit is contained in:
Sam 2013-12-20 19:12:08 +11:00
parent 95c4bf4cfa
commit bac2d21382
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/environments/production.rb
View file

@ -33,7 +33,7 @@ Discourse::Application.configure do
config.i18n.fallbacks = true config.i18n.fallbacks = true
if GlobalSetting.smtp_address if GlobalSetting.smtp_address
config.action_mailer.smtp_settings = { settings = {
address: GlobalSetting.smtp_address, address: GlobalSetting.smtp_address,
port: GlobalSetting.smtp_port, port: GlobalSetting.smtp_port,
domain: GlobalSetting.smtp_domain, domain: GlobalSetting.smtp_domain,
@ -41,6 +41,8 @@ Discourse::Application.configure do
authentication: 'plain', authentication: 'plain',
enable_starttls_auto: GlobalSetting.smtp_enable_start_tls enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
} }
config.action_mailer.smtp_settings = settings.reject{|x,y| y.nil?}
else else
config.action_mailer.delivery_method = :sendmail config.action_mailer.delivery_method = :sendmail
config.action_mailer.sendmail_settings = {arguments: '-i'} config.action_mailer.sendmail_settings = {arguments: '-i'}