From 63aad2e5d229d63afc0793abf601b5197f094774 Mon Sep 17 00:00:00 2001 From: Skid Date: Sat, 12 Nov 2022 22:07:03 +0100 Subject: [PATCH 1/2] Update config comment to reflect rfc8314. --- .env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.template b/.env.template index 1e5ff101..598a3b0c 100644 --- a/.env.template +++ b/.env.template @@ -352,7 +352,7 @@ # SMTP_FROM=vaultwarden@domain.tld # SMTP_FROM_NAME=Vaultwarden # SMTP_SECURITY=starttls # ("starttls", "force_tls", "off") Enable a secure connection. Default is "starttls" (Explicit - ports 587 or 25), "force_tls" (Implicit - port 465) or "off", no encryption (port 25) -# SMTP_PORT=587 # Ports 587 (submission) and 25 (smtp) are standard without encryption and with encryption via STARTTLS (Explicit TLS). Port 465 is outdated and used with Implicit TLS. +# SMTP_PORT=587 # Ports 587 (submission), 465 (submissions) and 25 (smtp) are standard without encryption and with encryption ports, 587 use STARTTLS (Explicit encryption) and 465 use native TLS (Implicit encryption) # SMTP_USERNAME=username # SMTP_PASSWORD=password # SMTP_TIMEOUT=15 From 4a9a0f7e649787990a3997f9f3d145485554a592 Mon Sep 17 00:00:00 2001 From: Skid Date: Sat, 12 Nov 2022 22:39:41 +0100 Subject: [PATCH 2/2] Update .env.template Co-authored-by: Helmut K. C. Tessarek --- .env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.template b/.env.template index 598a3b0c..badc8bfa 100644 --- a/.env.template +++ b/.env.template @@ -352,7 +352,7 @@ # SMTP_FROM=vaultwarden@domain.tld # SMTP_FROM_NAME=Vaultwarden # SMTP_SECURITY=starttls # ("starttls", "force_tls", "off") Enable a secure connection. Default is "starttls" (Explicit - ports 587 or 25), "force_tls" (Implicit - port 465) or "off", no encryption (port 25) -# SMTP_PORT=587 # Ports 587 (submission), 465 (submissions) and 25 (smtp) are standard without encryption and with encryption ports, 587 use STARTTLS (Explicit encryption) and 465 use native TLS (Implicit encryption) +# SMTP_PORT=587 # Ports 587 (submission) and 25 (smtp) are standard without encryption and with encryption via STARTTLS (Explicit TLS). Port 465 (submissions) is used for encrypted submission (Implicit TLS). # SMTP_USERNAME=username # SMTP_PASSWORD=password # SMTP_TIMEOUT=15