From: Eugen <eugen@zeonfederated.com>
Date: Tue, 11 Apr 2017 20:49:53 +0000 (+0200)
Subject: Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5cdd2c2414592f50005fa1dd73b80e332fb73cb7;p=mastodon.git

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 05cced67b..08dc7b30c 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,
   }