From: Sandro Date: Thu, 14 Oct 2021 19:05:50 +0000 (+0200) Subject: Default to system ca-certificates.crt if none is specified (#10857) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=085da139338d73598f8b98fc3b29ef8d66c00466;p=mastodon.git Default to system ca-certificates.crt if none is specified (#10857) Co-Authored-By: Yamagishi Kazutoshi Co-authored-by: Yamagishi Kazutoshi --- diff --git a/config/environments/production.rb b/config/environments/production.rb index df6b07d77..4a8899944 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -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,