logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 5cdd2c2414592f50005fa1dd73b80e332fb73cb7
parent: 3ddd936b039474259cff3793c767ecb7f74e89e0
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue, 11 Apr 2017 22:49:53 +0200

Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)


Diffstat:

Mconfig/environments/production.rb14+++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb @@ -94,13 +94,13 @@ Rails.application.configure do # E-mails config.action_mailer.smtp_settings = { - :port => ENV['SMTP_PORT'], - :address => ENV['SMTP_SERVER'], - :user_name => ENV['SMTP_LOGIN'], - :password => ENV['SMTP_PASSWORD'], - :domain => ENV['SMTP_DOMAIN'] || config.x.local_domain, - :authentication => ENV['SMTP_AUTH_METHOD'] || :plain, - :openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'] || 'peer', + :port => ENV['SMTP_PORT'], + :address => ENV['SMTP_SERVER'], + :user_name => ENV['SMTP_LOGIN'], + :password => ENV['SMTP_PASSWORD'], + :domain => ENV['SMTP_DOMAIN'] || config.x.local_domain, + :authentication => ENV['SMTP_AUTH_METHOD'] || :plain, + :openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'], :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true, }