Made SMTPS / TLS / SSL as default in configuration for Email encryption

Rabbit-Company · Dec 13, 2022 · 799bc1f · 799bc1f
1 parent 873f6c8
commit 799bc1f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/api/src/Settings.php b/api/src/Settings.php
@@ -135,7 +135,7 @@ public static function getMailHost() : string{
 	}
 
 	public static function getMailPort() : int{
-		return getenv('MAIL_PORT', true) ?: getenv('MAIL_PORT') ?: 587;
+		return getenv('MAIL_PORT', true) ?: getenv('MAIL_PORT') ?: 465;
 	}
 
 	public static function getMailUsername() : string{

diff --git a/installer.sh b/installer.sh
@@ -209,7 +209,7 @@ then
 
 	echo -e "\n${blue}${bold}Provide SMTP port.${blue}"
 	echo -e "Setting up SMTP is not required."
-	echo -e "Example: 587"
+	echo -e "Example: 465"
 	printf "\n${green}SMTP port: "
 	read MAIL_PORT
 	while [[ ! "$MAIL_PORT" =~ ^[0-9]{1,5}$ ]];

diff --git a/installerGUI.sh b/installerGUI.sh
@@ -83,10 +83,10 @@ then
 	MAIL_HOST=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP host.\n\nSetting up SMTP is not required." 12 78 mail.passky.org 3>&1 1>&2 2>&3)
 	echo "MAIL_HOST=${MAIL_HOST}" >> .env
 
-	MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required." 12 78 587 3>&1 1>&2 2>&3)
+	MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required." 12 78 465 3>&1 1>&2 2>&3)
 	while [[ ! "$MAIL_PORT" =~ ^[0-9]{1,5}$ ]];
 	do
-		MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required.\n\n'${MAIL_PORT}' is not a valid port. Port must be a number between 1 and 65535." 14 78 587 3>&1 1>&2 2>&3)
+		MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required.\n\n'${MAIL_PORT}' is not a valid port. Port must be a number between 1 and 65535." 14 78 465 3>&1 1>&2 2>&3)
 	done
 	echo "MAIL_PORT=${MAIL_PORT}" >> .env