Merge branch 'fix-docker-smtp-tls' into 'main'

fix(docker): allow to configure SMTP TLS

Closes #1363

See merge request framasoft/mobilizon!1467
This commit is contained in:
Thomas Citharel 2023-10-09 17:01:58 +00:00
commit 7e4310b293

View File

@ -49,7 +49,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
port: System.get_env("MOBILIZON_SMTP_PORT", "25"), port: System.get_env("MOBILIZON_SMTP_PORT", "25"),
username: System.get_env("MOBILIZON_SMTP_USERNAME", nil), username: System.get_env("MOBILIZON_SMTP_USERNAME", nil),
password: System.get_env("MOBILIZON_SMTP_PASSWORD", nil), password: System.get_env("MOBILIZON_SMTP_PASSWORD", nil),
tls: :if_available, tls: System.get_env("MOBILIZON_SMTP_TLS", :if_available),
allowed_tls_versions: [:"tlsv1.2", :"tlsv1.3"], allowed_tls_versions: [:"tlsv1.2", :"tlsv1.3"],
tls_options: [ tls_options: [
verify: :verify_peer, verify: :verify_peer,
@ -58,7 +58,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
server_name_indication: ~c"#{System.get_env("MOBILIZON_SMTP_SERVER", "localhost")}", server_name_indication: ~c"#{System.get_env("MOBILIZON_SMTP_SERVER", "localhost")}",
depth: 99 depth: 99
], ],
ssl: System.get_env("MOBILIZON_SMTP_SSL", "false"), ssl: System.get_env("MOBILIZON_SMTP_SSL", false),
retries: 1, retries: 1,
no_mx_lookups: false, no_mx_lookups: false,
auth: :if_available auth: :if_available