From b6f2c8ce64119685f0909b211830525be7d80ad2 Mon Sep 17 00:00:00 2001
From: gyurix <gyorgy.berenyi@format.hu>
Date: Wed, 21 Jun 2023 12:30:30 +0000
Subject: [PATCH] SMTP variables

---
 additional_install.sh | 42 ++++++++++++++++++++++---------
 install.sh            | 57 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/additional_install.sh b/additional_install.sh
index 6b3ae88..113d481 100755
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -56,7 +56,27 @@ if [[ "$BITWARDEN" == "yes" ]]; then
 	sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
 	sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json
-	sed -i "s/ADMIN_TOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/ADMINTOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
+
+	if [ "$SMTP_SERVER" == "gmail" ]; then
+		SMTP_HOST="smtp.gmail.com";
+		SMTP_PORT="587";
+		SMTP_SECURITY="starttls";
+	elif [ "$SMTP_SERVER" == "microsoft" ]; then
+		SMTP_HOST="smtp-mail.outlook.com";
+		SMTP_PORT="587";
+		SMTP_SECURITY="starttls";
+		SMTP_AUTH_MECHANISM="Login";
+	fi;
+
+	sed -i "s/SMTPHOST/$SMTP_HOST/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/SMTPPORT/$SMTP_PORT/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/SMTPSECURITY/$SMTP_SECURITY/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/SMTPFROM/$SMTP_FROM/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/SMTPUSERNAME/$SMTP_USERNAME/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/SMTPPASSWORD/$SMTP_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/SMTPAUTHMECHANISM/$SMTP_AUTH_MECHANISM/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/DOMAINSWHITELIST/$DOMAINS_WHITELIST/g" /tmp/bitwarden/bitwarden-secret.json
 
 	cp -rv /tmp/bitwarden/bitwarden-secret.json /etc/user/secret/bitwarden.json;
 	cp -rv /tmp/bitwarden/bitwarden.json $SERVICE_DIR/bitwarden.json;
@@ -66,16 +86,14 @@ if [[ "$BITWARDEN" == "yes" ]]; then
 	cp -rv /tmp/bitwarden/firewall-bitwarden-mtp.json $SERVICE_DIR/firewall-bitwarden-smtp.json;
 fi;
 
-if [[ "$NEXTCLOUD" == "yes" ] || [ "$BITWARDEN" == "yes" ]]; then 
-	echo "SMTP service install has started from ssh://$GIT_REPO/$ORGANIZATION/smtp.git";
-
-	git clone ssh://$GIT_REPO/$ORGANIZATION/smtp.git /tmp/smtp
-
-	cp -rv /tmp/smtp/smtp-secret.json /etc/user/secret/smtp.json;
-	cp -rv /tmp/smtp/smtp.json $SERVICE_DIR/smtp.json;
-	cp -rv /tmp/smtp/firewall-smtp.json $SERVICE_DIR/firewall-smtp.json;
-	
-
-fi;
+#if [[ "$NEXTCLOUD" == "yes" ] || [ "$BITWARDEN" == "yes" ]]; then 
+#	echo "SMTP service install has started from ssh://$GIT_REPO/$ORGANIZATION/smtp.git";
+#
+#	git clone ssh://$GIT_REPO/$ORGANIZATION/smtp.git /tmp/smtp
+#
+#	cp -rv /tmp/smtp/smtp-secret.json /etc/user/secret/smtp.json;
+#	cp -rv /tmp/smtp/smtp.json $SERVICE_DIR/smtp.json;
+#	cp -rv /tmp/smtp/firewall-smtp.json $SERVICE_DIR/firewall-smtp.json;
+#fi;
 
 
diff --git a/install.sh b/install.sh
index d2091fd..f54809c 100755
--- a/install.sh
+++ b/install.sh
@@ -325,6 +325,63 @@ ask_additionals() {
 			fi;
 		done
 
+		echo "Please choose an SMTP server (gmail/outlook/other): ";
+		while read -r SMTP_SERVER; do
+			if [ "$SMTP_SERVER" != "" ]; then
+				break;
+			fi;
+		done
+
+		if [ "$SMTP_SERVER" == "other" ]; then
+			echo "Please add STMP HOST: ";
+			while read -r SMTP_HOST; do
+				if [ "$SMTP_HOST" != "" ]; then
+					break;
+				fi;
+			done
+
+			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.): ";
+			while read -r SMTP_SECURITY; do
+				if [ "$SMTP_SECURITY" != "" ]; then
+					break;
+				fi;
+			done
+		fi
+
+		echo "Please add STMP FROM (mail address from): ";
+		while read -r SMTP_FROM; do
+			if [ "$SMTP_FROM" != "" ]; then
+				break;
+			fi;
+		done
+
+		echo "Please add STMP USERNAME: ";
+		while read -r SMTP_USERNAME; do
+			if [ "$SMTP_USERNAME" != "" ]; then
+				break;
+			fi;
+		done
+
+		echo "Please add STMP PASSWORD: ";
+		while read -r SMTP_PASSWORD; do
+			if [ "$SMTP_PASSWORD" != "" ]; then
+				break;
+			fi;
+		done
+
+		echo "Please add Domains Whitelist: ";
+		while read -r DOMAINS_WHITELIST; do
+			if [ "$DOMAINS_WHITELIST" != "" ]; then
+				break;
+			fi;
+		done
 
 	fi