nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

okay that didn't work, lets try it this way

Browse source
This commit is contained in:
Jonne Hass 2011-11-12 11:36:16 +01:00
parent 3c980b7201
commit 5437b6fbd0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/initializers/mailer_config.rb
View file

@ -16,10 +16,11 @@ Diaspora::Application.configure do
end end
elsif AppConfig[:mailer_method] == "sendmail" elsif AppConfig[:mailer_method] == "sendmail"
config.action_mailer.delivery_method = :sendmail config.action_mailer.delivery_method = :sendmail
config.action_mailer.sendmail_settings = { sendmail_settings = {
:location => AppConfig[:sendmail_location], :location => AppConfig[:sendmail_location]
:arguments => "-i" if AppConfig[:sendmail_exim_fix]
} }
sendmail_settings[:arguments] = "-i" if AppConfig[:sendmail_exim_fix]
config.action_mailer.sendmail_settings = sendmail_settings
else else
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
if AppConfig[:smtp_authentication] == "none" if AppConfig[:smtp_authentication] == "none"