added fix for using sendmail with exim, the default -t argument behaves different so lets take it out
This commit is contained in:
parent
9839ac559c
commit
3c980b7201
2 changed files with 5 additions and 1 deletions
|
|
@ -127,6 +127,9 @@ defaults: &defaults
|
|||
|
||||
# The path to the sendmail binary. Ignored if mailer_method is not set to sendmail
|
||||
sendmail_location: '/usr/sbin/sendmail'
|
||||
|
||||
# Set this to true if you want to use exim and sendmail
|
||||
sendmail_exim_fix: false
|
||||
|
||||
# Authentication required to send mail. Use one of 'one', 'plain',
|
||||
# 'login' or 'cram-md5'. Use 'none' if server does not support
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ Diaspora::Application.configure do
|
|||
elsif AppConfig[:mailer_method] == "sendmail"
|
||||
config.action_mailer.delivery_method = :sendmail
|
||||
config.action_mailer.sendmail_settings = {
|
||||
:location => AppConfig[:sendmail_location]
|
||||
:location => AppConfig[:sendmail_location],
|
||||
:arguments => "-i" if AppConfig[:sendmail_exim_fix]
|
||||
}
|
||||
else
|
||||
config.action_mailer.delivery_method = :smtp
|
||||
|
|
|
|||
Loading…
Reference in a new issue