From aa64e50374ded2ded7d8ab587f9224c64dcebb90 Mon Sep 17 00:00:00 2001
From: Abhishek K <32607604+abhishek9686@users.noreply.github.com>
Date: Thu, 22 Aug 2024 08:36:38 +0530
Subject: [PATCH] Net 1227 (#3060)

* generalise smtp config

* copy over smtp vars

* env new line
---
 scripts/netmaker.default.env | 8 +++++---
 scripts/nm-quick.sh          | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/netmaker.default.env b/scripts/netmaker.default.env
index 876c2a4b..196ad366 100644
--- a/scripts/netmaker.default.env
+++ b/scripts/netmaker.default.env
@@ -82,7 +82,9 @@ SMTP_HOST=smtp.gmail.com
 SMTP_PORT=587
 # sender email
 EMAIL_SENDER_ADDR=
-# sender email auth
-EMAIL_SENDER_AUTH=
+# sender smtp user, if unset sender email will be used
+EMAIL_SENDER_USER=
+# sender smtp password
+EMAIL_SENDER_PASSWORD=
 # mail sender type (smtp or resend)
-EMAIL_SENDER_TYPE=smtp
\ No newline at end of file
+EMAIL_SENDER_TYPE=smtp
diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index ab18eed5..2a1d6759 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -253,7 +253,8 @@ save_config() { (
 		"INSTALL_TYPE" "NODE_ID" "DNS_MODE" "NETCLIENT_AUTO_UPDATE" "API_PORT"
 		"CORS_ALLOWED_ORIGIN" "DISPLAY_KEYS" "DATABASE" "SERVER_BROKER_ENDPOINT" "VERBOSITY"
 		"DEBUG_MODE"  "REST_BACKEND" "DISABLE_REMOTE_IP_CHECK" "TELEMETRY" "ALLOWED_EMAIL_DOMAINS" "AUTH_PROVIDER" "CLIENT_ID" "CLIENT_SECRET"
-		"FRONTEND_URL" "AZURE_TENANT" "OIDC_ISSUER" "EXPORTER_API_PORT" "JWT_VALIDITY_DURATION" "RAC_AUTO_DISABLE" "CACHING_ENABLED" "ENDPOINT_DETECTION")
+		"FRONTEND_URL" "AZURE_TENANT" "OIDC_ISSUER" "EXPORTER_API_PORT" "JWT_VALIDITY_DURATION" "RAC_AUTO_DISABLE" "CACHING_ENABLED" "ENDPOINT_DETECTION"
+		"SMTP_HOST" "SMTP_PORT" "EMAIL_SENDER_ADDR" "EMAIL_SENDER_USER" "EMAIL_SENDER_PASSWORD" "EMAIL_SENDER_TYPE")
 	for name in "${toCopy[@]}"; do
 		save_config_item $name "${!name}"
 	done