forked from External/greenlight
allow for mail system without authentication (#1019)
* allow for mail system without authentication * try to fix travis build
This commit is contained in:
parent
7fa7d2f525
commit
bf04743bc5
|
@ -82,15 +82,24 @@ Rails.application.configure do
|
|||
# Tell Action Mailer to use smtp server, if configured
|
||||
config.action_mailer.delivery_method = ENV['SMTP_SERVER'].present? ? :smtp : :sendmail
|
||||
|
||||
ActionMailer::Base.smtp_settings = {
|
||||
address: ENV['SMTP_SERVER'],
|
||||
port: ENV["SMTP_PORT"],
|
||||
domain: ENV['SMTP_DOMAIN'],
|
||||
user_name: ENV['SMTP_USERNAME'],
|
||||
password: ENV['SMTP_PASSWORD'],
|
||||
authentication: ENV['SMTP_AUTH'],
|
||||
enable_starttls_auto: ENV['SMTP_STARTTLS_AUTO'],
|
||||
}
|
||||
ActionMailer::Base.smtp_settings = if ENV['SMTP_AUTH'].present? && ENV['SMTP_AUTH'] != "none"
|
||||
{
|
||||
address: ENV['SMTP_SERVER'],
|
||||
port: ENV["SMTP_PORT"],
|
||||
domain: ENV['SMTP_DOMAIN'],
|
||||
user_name: ENV['SMTP_USERNAME'],
|
||||
password: ENV['SMTP_PASSWORD'],
|
||||
authentication: ENV['SMTP_AUTH'],
|
||||
enable_starttls_auto: ENV['SMTP_STARTTLS_AUTO'],
|
||||
}
|
||||
else
|
||||
{
|
||||
address: ENV['SMTP_SERVER'],
|
||||
port: ENV["SMTP_PORT"],
|
||||
domain: ENV['SMTP_DOMAIN'],
|
||||
enable_starttls_auto: ENV['SMTP_STARTTLS_AUTO'],
|
||||
}
|
||||
end
|
||||
|
||||
# Don't care if the mailer can't send.
|
||||
config.action_mailer.raise_delivery_errors = true
|
||||
|
|
Loading…
Reference in New Issue