summaryrefslogtreecommitdiffstats
path: root/config/environments/production.rb
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-11 22:49:53 +0200
committerGitHub <noreply@github.com>2017-04-11 22:49:53 +0200
commit5cdd2c2414592f50005fa1dd73b80e332fb73cb7 (patch)
tree737976582329183badaefbf6f4151dc9e673dc2f /config/environments/production.rb
parent3ddd936b039474259cff3793c767ecb7f74e89e0 (diff)
Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)
Diffstat (limited to 'config/environments/production.rb')
-rw-r--r--config/environments/production.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 05cced67b55..08dc7b30c20 100644
--- 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,
}