mirror of
https://github.com/astuto/astuto.git
synced 2025-12-16 03:37:56 +01:00
Fix SMTP (#370)
This commit is contained in:
committed by
GitHub
parent
2f3ebf88a5
commit
1aae8bc194
@@ -51,13 +51,14 @@ Rails.application.configure do
|
|||||||
user_name: ENV.fetch("EMAIL_SMTP_USER"),
|
user_name: ENV.fetch("EMAIL_SMTP_USER"),
|
||||||
password: ENV.fetch("EMAIL_SMTP_PASS"),
|
password: ENV.fetch("EMAIL_SMTP_PASS"),
|
||||||
authentication: ENV.fetch("EMAIL_SMTP_AUTH", "plain"),
|
authentication: ENV.fetch("EMAIL_SMTP_AUTH", "plain"),
|
||||||
enable_starttls_auto: ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_SMTP_STARTTLS_AUTO", "true")),
|
enable_starttls_auto: ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_SMTP_STARTTLS_AUTO", "false")),
|
||||||
openssl_verify_mode: ENV["EMAIL_SMTP_OPENSSL_VERIFY_MODE"],
|
openssl_verify_mode: ENV.fetch("EMAIL_SMTP_OPENSSL_VERIFY_MODE", "none"),
|
||||||
tls: ENV["EMAIL_SMTP_TLS"]
|
tls: ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_SMTP_TLS", "false")),
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
config.action_mailer.default_options = {
|
config.action_mailer.default_options = {
|
||||||
|
from: ENV.fetch("EMAIL_MAIL_FROM", "noreply@astuto.io"),
|
||||||
reply_to: "noreply@astuto.io"
|
reply_to: "noreply@astuto.io"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +66,7 @@ Rails.application.configure do
|
|||||||
config.active_storage.service = :local
|
config.active_storage.service = :local
|
||||||
|
|
||||||
# Don't care if the mailer can't send.
|
# Don't care if the mailer can't send.
|
||||||
config.action_mailer.raise_delivery_errors = false
|
config.action_mailer.raise_delivery_errors = ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_RAISE_DELIVERY_ERRORS", "false"))
|
||||||
|
|
||||||
config.action_mailer.perform_caching = false
|
config.action_mailer.perform_caching = false
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ Rails.application.configure do
|
|||||||
|
|
||||||
# Ignore bad email addresses and do not raise email delivery errors.
|
# Ignore bad email addresses and do not raise email delivery errors.
|
||||||
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
|
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
|
||||||
config.action_mailer.raise_delivery_errors = false
|
config.action_mailer.raise_delivery_errors = ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_RAISE_DELIVERY_ERRORS", "false"))
|
||||||
|
|
||||||
if ENV['EMAIL_DELIVERY_METHOD'] == "smtp"
|
if ENV['EMAIL_DELIVERY_METHOD'] == "smtp"
|
||||||
config.action_mailer.delivery_method = :smtp
|
config.action_mailer.delivery_method = :smtp
|
||||||
@@ -77,11 +77,12 @@ Rails.application.configure do
|
|||||||
authentication: ENV.fetch("EMAIL_SMTP_AUTH", "plain"),
|
authentication: ENV.fetch("EMAIL_SMTP_AUTH", "plain"),
|
||||||
enable_starttls_auto: ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_SMTP_STARTTLS_AUTO", "true")),
|
enable_starttls_auto: ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_SMTP_STARTTLS_AUTO", "true")),
|
||||||
openssl_verify_mode: ENV["EMAIL_SMTP_OPENSSL_VERIFY_MODE"],
|
openssl_verify_mode: ENV["EMAIL_SMTP_OPENSSL_VERIFY_MODE"],
|
||||||
tls: ENV["EMAIL_SMTP_TLS"]
|
tls: ActiveModel::Type::Boolean.new.cast(ENV.fetch("EMAIL_SMTP_TLS", "true")),
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
config.action_mailer.default_options = {
|
config.action_mailer.default_options = {
|
||||||
|
from: ENV.fetch("EMAIL_MAIL_FROM", "noreply@astuto.io"),
|
||||||
reply_to: "noreply@astuto.io"
|
reply_to: "noreply@astuto.io"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user