mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-10-06 03:46:39 +08:00
Merge pull request #2423 from okriuchykhin/ok_SCI_4370
Add variables with TLS CA configuration for mail [SCI-4370]
This commit is contained in:
commit
f6a47eca14
2 changed files with 5 additions and 1 deletions
|
@ -41,7 +41,9 @@ Rails.application.configure do
|
||||||
enable_starttls_auto: true,
|
enable_starttls_auto: true,
|
||||||
user_name: Rails.application.secrets.mailer_user_name,
|
user_name: Rails.application.secrets.mailer_user_name,
|
||||||
password: Rails.application.secrets.mailer_password,
|
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
|
#config.action_mailer.perform_deliveries = false
|
||||||
|
|
|
@ -42,6 +42,8 @@ common: &common
|
||||||
mailer_user_name: <%= ENV["SMTP_USERNAME"] %>
|
mailer_user_name: <%= ENV["SMTP_USERNAME"] %>
|
||||||
mailer_password: <%= ENV["SMTP_PASSWORD"] %>
|
mailer_password: <%= ENV["SMTP_PASSWORD"] %>
|
||||||
mailer_openssl_verify_mode: <%= ENV["SMTP_OPENSSL_VERIFY_MODE"] || "peer" %>
|
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.
|
# Your secret key is used for verifying the integrity of signed cookies.
|
||||||
|
|
Loading…
Add table
Reference in a new issue