techhub/mastodon
2
0
Fork 0
Code Activity

Add optional bulk mailer settings (#35203)

Browse Source
This commit is contained in:
David Roetzel
2025-06-30 16:49:14 +02:00
committed by GitHub
parent bae258925c
commit c357a7f8d6
11 changed files with 90 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
config/email.yml
View File

@@ -19,3 +19,18 @@ production:
tls: <%= ENV.fetch('SMTP_TLS', false) == 'true' ? true : nil %>
ssl: <%= ENV.fetch('SMTP_SSL', false) == 'true' ? true : nil %>
read_timeout: 20
bulk_mail:
smtp_settings:
port: <%= ENV.fetch('BULK_SMTP_PORT', nil) %>
address: <%= ENV.fetch('BULK_SMTP_SERVER', nil) %>
user_name: <%= ENV.fetch('BULK_SMTP_LOGIN', nil) %>
password: <%= ENV.fetch('BULK_SMTP_PASSWORD', nil) %>
domain: <%= ENV.fetch('BULK_SMTP_DOMAIN', ENV.fetch('LOCAL_DOMAIN', nil)) %>
authentication: <%= ENV.fetch('BULK_SMTP_AUTH_METHOD', 'plain') %>
ca_file: <%= ENV.fetch('BULK_SMTP_CA_FILE', '/etc/ssl/certs/ca-certificates.crt') %>
openssl_verify_mode: <%= ENV.fetch('BULK_SMTP_OPENSSL_VERIFY_MODE', nil) %>
enable_starttls: <%= ENV.fetch('BULK_SMTP_ENABLE_STARTTLS', nil) %>
enable_starttls_auto: <%= ENV.fetch('BULK_SMTP_ENABLE_STARTTLS_AUTO', true) != 'false' %>
tls: <%= ENV.fetch('BULK_SMTP_TLS', false) == 'true' ? true : nil %>
ssl: <%= ENV.fetch('BULK_SMTP_SSL', false) == 'true' ? true : nil %>
read_timeout: 20

2
config/environments/production.rb
View File

@@ -110,7 +110,7 @@ Rails.application.configure do
config.action_mailer.default_options[:reply_to] = config.x.email.reply_to if config.x.email.reply_to.present?
config.action_mailer.default_options[:return_path] = config.x.email.return_path if config.x.email.return_path.present?
config.action_mailer.smtp_settings = Mastodon::EmailConfigurationHelper.smtp_settings(config.x.email.smtp_settings)
config.action_mailer.smtp_settings = Mastodon::EmailConfigurationHelper.convert_smtp_settings(config.x.email.smtp_settings)
config.action_mailer.delivery_method = config.x.email.delivery_method.to_sym