Ver código fonte

Net 1227 (#3060)

* generalise smtp config

* copy over smtp vars

* env new line
Abhishek K 1 ano atrás
pai
commit
aa64e50374
2 arquivos alterados com 7 adições e 4 exclusões
  1. 5 3
      scripts/netmaker.default.env
  2. 2 1
      scripts/nm-quick.sh

+ 5 - 3
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
+EMAIL_SENDER_TYPE=smtp

+ 2 - 1
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