Merge branch 'environment-smtp-verify' of https://github.com/cfstras/discourse

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
 

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?}