From 60b7e47ebb64eb2ce5bfb78d64eb0aaf1c9c4a6e Mon Sep 17 00:00:00 2001
From: Mark Nash <abacefabmicroblast@hotmail.com>
Date: Sat, 4 Jan 2025 19:23:27 -0800
Subject: [PATCH] Removing the unavailable verbiage from Gmail app passwords,
 and added the required SMTP_FROM env var

---
 SMTP-Configuration.md | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/SMTP-Configuration.md b/SMTP-Configuration.md
index ffa6354..af044c1 100644
--- a/SMTP-Configuration.md
+++ b/SMTP-Configuration.md
@@ -72,7 +72,7 @@ By default the machine's hostname is used as the hostname in the HELO command. T
 
 ### Google/Gmail
 You need to generate a App Password for Vaultwarden to work with Gmail.<br>
-Follow the steps here: https://support.google.com/accounts/answer/185833?hl=en&ref_topic=7189145 (unavailable since 5/30/2022)<br>
+Follow the steps here: https://support.google.com/accounts/answer/185833?hl=en&ref_topic=7189145 <br>
 In the end you well be shown a password (with spaces in between which are not there, it is just for easy type-over), use this password.<br>
 
 > [!NOTE]
@@ -85,18 +85,12 @@ FullSSL:
   SMTP_HOST=smtp.gmail.com
   SMTP_PORT=465
   SMTP_SECURITY=force_tls
-  SMTP_USERNAME=<mail-address>
-  SMTP_PASSWORD=<less-secure-app-password>
-```
-StartTLS:
-```ini
-  # Domains: gmail.com, googlemail.com
-  SMTP_HOST=smtp.gmail.com
-  SMTP_PORT=587
-  SMTP_SECURITY=starttls
-  SMTP_USERNAME=<mail-address>
+  SMTP_FROM=<vaultwarden@domain.tld>
+  SMTP_USERNAME=<mail-address-for-app-password>
   SMTP_PASSWORD=<less-secure-app-password>
 ```
+StartTLS: change the `SMTP_PORT` to `587` and the `SMTP_SECURITY` to `starttls`
+
 Also see: https://web.archive.org/web/20210925161633/https://webewizard.com/2019/09/17/Using-Lettre-With-Gmail/
 
 ### Hotmail/Outlook/Office365