]> cat aescling's git repositories - mastodon.git/commitdiff
Default to system ca-certificates.crt if none is specified (#10857)
authorSandro <sandro.jaeckel@gmail.com>
Thu, 14 Oct 2021 19:05:50 +0000 (21:05 +0200)
committerGitHub <noreply@github.com>
Thu, 14 Oct 2021 19:05:50 +0000 (21:05 +0200)
Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
config/environments/production.rb

index df6b07d77df7ae6395da02831ad532d3f58e35a3..4a88999449d6b8a71a2c87f236a8d1338c86ce50 100644 (file)
@@ -105,7 +105,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,
+    :ca_file              => ENV['SMTP_CA_FILE'].presence || '/etc/ssl/certs/ca-certificates.crt',
     :openssl_verify_mode  => ENV['SMTP_OPENSSL_VERIFY_MODE'],
     :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
     :tls                  => ENV['SMTP_TLS'].presence,