diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-05-03 08:03:12 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 01:03:12 +0200 |
| commit | 26bc5915727e0a0173c03cb49f5193dd612fb888 (patch) | |
| tree | 264c2e32ae3c358d0e4308da6c559d67756582a6 | |
| parent | 268dd32d76b42dc1f2a044cedeee5446cb9185c2 (diff) | |
Allow to set CA file for SMTP (#2713)
| -rw-r--r-- | .env.production.sample | 1 | ||||
| -rw-r--r-- | config/environments/production.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.env.production.sample b/.env.production.sample index 5ef76caa5..ca0314824 100644 --- 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 index fde69dc70..a1cd0fb35 100644 --- 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, } |