Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Mua: support 465 port connections (#4606)
ruslandoga09c74ee0b346
diff --git a/config/runtime.exs b/config/runtime.exsindex d8ee53da8e..e07528fcd9 100644--- a/config/runtime.exs+++ b/config/runtime.exs@@ -641,8 +641,21 @@ case mailer_adapter doconfig :plausible, Plausible.Mailer, ssl: [middlebox_comp_mode: middlebox_comp_mode]if relay = get_var_from_path_or_env(config_dir, "SMTP_HOST_ADDR") do- port = get_int_from_path_or_env(config_dir, "SMTP_HOST_PORT", 25)- config :plausible, Plausible.Mailer, relay: relay, port: port+ port = get_int_from_path_or_env(config_dir, "SMTP_HOST_PORT", 587)++ ssl_enabled =+ if ssl_enabled = get_var_from_path_or_env(config_dir, "SMTP_HOST_SSL_ENABLED") do+ String.to_existing_atom(ssl_enabled)+ end++ protocol =+ cond do+ ssl_enabled -> :ssl+ is_nil(ssl_enabled) and port == 465 -> :ssl+ true -> :tcp+ end++ config :plausible, Plausible.Mailer, protocol: protocol, relay: relay, port: portendusername = get_var_from_path_or_env(config_dir, "SMTP_USER_NAME")diff --git a/test/plausible/config_test.exs b/test/plausible/config_test.exsindex 920b0d58e1..07ae08c1c1 100644--- a/test/plausible/config_test.exs+++ b/test/plausible/config_test.exs@@ -168,12 +168,52 @@ defmodule Plausible.ConfigTest doassert get_in(runtime_config(env), [:plausible, Plausible.Mailer]) == [{:adapter, Bamboo.Mua},{:ssl, [middlebox_comp_mode: false]},+ {:protocol, :tcp},{:relay, "localhost"},{:port, 2525},{:auth, [username: "neo", password: "one"]}]end+ test "Bamboo.Mua (ssl relay config)" do+ env = [+ {"MAILER_ADAPTER", "Bamboo.Mua"},+ {"SMTP_HOST_ADDR", "localhost"},+ {"SMTP_HOST_PORT", "2525"},+ {"SMTP_HOST_SSL_ENABLED", "true"},+ {"SMTP_USER_NAME", "neo"},+ {"SMTP_USER_PWD", "one"}+ ]++ assert get_in(runtime_config(env), [:plausible, Plausible.Mailer]) == [+ {:adapter, Bamboo.Mua},+ {:ssl, [middlebox_comp_mode: false]},+ {:protocol, :ssl},+ {:relay, "localhost"},+ {:port, 2525},+ {:auth, [username: "neo", password: "one"]}+ ]+ end++ test "Bamboo.Mua (port=465 relay config)" do+ env = [+ {"MAILER_ADAPTER", "Bamboo.Mua"},+ {"SMTP_HOST_ADDR", "localhost"},+ {"SMTP_HOST_PORT", "465"},+ {"SMTP_USER_NAME", "neo"},+ {"SMTP_USER_PWD", "one"}+ ]++ assert get_in(runtime_config(env), [:plausible, Plausible.Mailer]) == [+ {:adapter, Bamboo.Mua},+ {:ssl, [middlebox_comp_mode: false]},+ {:protocol, :ssl},+ {:relay, "localhost"},+ {:port, 465},+ {:auth, [username: "neo", password: "one"]}+ ]+ end+test "Bamboo.Mua (no auth relay config)" doenv = [{"MAILER_ADAPTER", "Bamboo.Mua"},@@ -186,6 +226,7 @@ defmodule Plausible.ConfigTest doassert get_in(runtime_config(env), [:plausible, Plausible.Mailer]) == [adapter: Bamboo.Mua,ssl: [middlebox_comp_mode: false],+ protocol: :tcp,relay: "localhost",port: 2525]