mastofe

commit: 26bc5915727e0a0173c03cb49f5193dd612fb888
parent: 268dd32d76b42dc1f2a044cedeee5446cb9185c2
Author: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date:   Wed,  3 May 2017 08:03:12 +0900

Allow to set CA file for SMTP (#2713)


Diffstat:
M
.env.production.sample
1
+
M
config/environments/production.rb
1
+

2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/.env.production.sample b/.env.production.sample
@@ -46,6 +46,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
 #SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
 #SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
 #SMTP_AUTH_METHOD=plain
+#SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
 #SMTP_OPENSSL_VERIFY_MODE=peer
 #SMTP_ENABLE_STARTTLS_AUTO=true
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -99,6 +99,7 @@ Rails.application.configure do
     :password             => ENV['SMTP_PASSWORD'].presence,
     :domain               => ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'],
     :authentication       => ENV['SMTP_AUTH_METHOD'] == 'none' ? nil : ENV['SMTP_AUTH_METHOD'] || :plain,
+    :ca_file              => ENV['SMTP_CA_FILE'].presence,
     :openssl_verify_mode  => ENV['SMTP_OPENSSL_VERIFY_MODE'],
     :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
   }