From 6e804cfb8d63a6cbb040d81c0e3f90a101df732f Mon Sep 17 00:00:00 2001
From: hael <laci@sse.hu>
Date: Wed, 21 Jun 2023 12:40:07 +0000
Subject: [PATCH] --env

---
 additional_install.sh |  4 ++--
 install.sh            | 23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/additional_install.sh b/additional_install.sh
index 113d481..50499dc 100755
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -58,11 +58,11 @@ if [[ "$BITWARDEN" == "yes" ]]; then
 	sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json
 	sed -i "s/ADMINTOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
 
-	if [ "$SMTP_SERVER" == "gmail" ]; then
+	if [ "$SMTP_SERVER" == "1" ]; then
 		SMTP_HOST="smtp.gmail.com";
 		SMTP_PORT="587";
 		SMTP_SECURITY="starttls";
-	elif [ "$SMTP_SERVER" == "microsoft" ]; then
+	elif [ "$SMTP_SERVER" == "2" ]; then
 		SMTP_HOST="smtp-mail.outlook.com";
 		SMTP_PORT="587";
 		SMTP_SECURITY="starttls";
diff --git a/install.sh b/install.sh
index f54809c..763da3c 100755
--- a/install.sh
+++ b/install.sh
@@ -325,14 +325,17 @@ ask_additionals() {
 			fi;
 		done
 
-		echo "Please choose an SMTP server (gmail/outlook/other): ";
+		echo "Please choose an SMTP server (1/2/3): ";
+		echo "1 - Gmail";
+		echo "2 - Microsoft Outlook/Hotmail";
+		echo "3 - Other";
 		while read -r SMTP_SERVER; do
 			if [ "$SMTP_SERVER" != "" ]; then
 				break;
 			fi;
 		done
 
-		if [ "$SMTP_SERVER" == "other" ]; then
+		if [ "$SMTP_SERVER" == "3" ]; then
 			echo "Please add STMP HOST: ";
 			while read -r SMTP_HOST; do
 				if [ "$SMTP_HOST" != "" ]; then
@@ -340,14 +343,14 @@ ask_additionals() {
 				fi;
 			done
 
-			echo "Please add STMP PORT (587,465,25,etc.): ";
+			echo "Please add STMP PORT (587, 465, 25, etc.): ";
 			while read -r SMTP_PORT; do
 				if [ "$SMTP_PORT" != "" ]; then
 					break;
 				fi;
 			done
 
-			echo "Please add STMP SECURITY (starttls,force_tls,off,etc.): ";
+			echo "Please add STMP SECURITY (starttls, force_tls, off, etc.): ";
 			while read -r SMTP_SECURITY; do
 				if [ "$SMTP_SECURITY" != "" ]; then
 					break;
@@ -370,13 +373,13 @@ ask_additionals() {
 		done
 
 		echo "Please add STMP PASSWORD: ";
-		while read -r SMTP_PASSWORD; do
+		while read -r -s SMTP_PASSWORD; do
 			if [ "$SMTP_PASSWORD" != "" ]; then
 				break;
 			fi;
 		done
 
-		echo "Please add Domains Whitelist: ";
+		echo "Please add Domains Whitelist (list of domains): ";
 		while read -r DOMAINS_WHITELIST; do
 			if [ "$DOMAINS_WHITELIST" != "" ]; then
 				break;
@@ -570,6 +573,14 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 	if [ "$BITWARDEN" != "" ]; then
 		VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
 		VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SERVER=$SMTP_SERVER";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_HOST=$SMTP_HOST";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_PORT=$SMTP_PORT";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SECURITY=$SMTP_SECURITY";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_FROM=$SMTP_FROM";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_USER=$SMTP_USER";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_PASSWORD=$SMTP_PASSWORD";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env DOMAINS_WHITELIST=$DOMAINS_WHITELIST";
 	
 		echo "You can access your bitwarden admin page here: https://$BITWARDEN_DOMAIN/admin";
 		echo "You will find ADMIN TOKEN in this file: /etc/user/secret/bitwarden-secret.json";