From b53248178b074946e1a1ab7ad3b0f89d371842ab Mon Sep 17 00:00:00 2001 From: Claus Strasburger Date: Wed, 7 May 2014 23:59:05 +0200 Subject: [PATCH] Added `openssl_verify_mode` parameter for action_mailer. - parameter in `environments/production.rb` - documentation & default value (nil) in `discourse_defaults.conf` --- config/discourse_defaults.conf | 4 ++++ config/environments/production.rb | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf index f4ede17d424..a575c2adb9e 100644 --- a/config/discourse_defaults.conf +++ b/config/discourse_defaults.conf @@ -63,6 +63,10 @@ smtp_authentication = plain # enable TLS encryption for smtp connections smtp_enable_start_tls = true +# mode for verifying smtp server certificates +# to disable, set to 'none' +smtp_openssl_verify_mode = + # enable MiniProfiler for administrators enable_mini_profiler = true diff --git a/config/environments/production.rb b/config/environments/production.rb index c359f8d7b20..4a2e3eca909 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -36,7 +36,8 @@ Discourse::Application.configure do user_name: GlobalSetting.smtp_user_name, password: GlobalSetting.smtp_password, authentication: GlobalSetting.smtp_authentication, - enable_starttls_auto: GlobalSetting.smtp_enable_start_tls + enable_starttls_auto: GlobalSetting.smtp_enable_start_tls, + openssl_verify_mode: GlobalSetting.smtp_openssl_verify_mode } config.action_mailer.smtp_settings = settings.reject{|x,y| y.nil?}