Merge pull request #2423 from okriuchykhin/ok_SCI_4370

Add variables with TLS CA configuration for mail [SCI-4370]
This commit is contained in:
Alex Kriuchykhin 2020-02-28 16:40:41 +01:00 committed by GitHub
commit f6a47eca14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View file

@ -41,7 +41,9 @@ Rails.application.configure do
enable_starttls_auto: true,
user_name: Rails.application.secrets.mailer_user_name,
password: Rails.application.secrets.mailer_password,
openssl_verify_mode: Rails.application.secrets.mailer_openssl_verify_mode
openssl_verify_mode: Rails.application.secrets.mailer_openssl_verify_mode,
ca_path: Rails.application.secrets.mailer_openssl_ca_path,
ca_file: Rails.application.secrets.mailer_openssl_ca_file
}
#config.action_mailer.perform_deliveries = false

View file

@ -42,6 +42,8 @@ common: &common
mailer_user_name: <%= ENV["SMTP_USERNAME"] %>
mailer_password: <%= ENV["SMTP_PASSWORD"] %>
mailer_openssl_verify_mode: <%= ENV["SMTP_OPENSSL_VERIFY_MODE"] || "peer" %>
mailer_openssl_ca_path: <%= ENV["SMTP_OPENSSL_CA_PATH"] || "/etc/ssl/certs" %>
mailer_openssl_ca_file: <%= ENV["SMTP_OPENSSL_CA_FILE"] || "/etc/ssl/certs/ca-certificates.crt" %>
# ======================================================================
# Your secret key is used for verifying the integrity of signed cookies.