Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/vm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hansson <github@hanssonit.se>2020-10-02 22:57:33 +0300
committerGitHub <noreply@github.com>2020-10-02 22:57:33 +0300
commit8640c74c091f0be7dcba03d84be6f8bdb29802f8 (patch)
tree878b890b58475ed33e1a0ada3d08f9d327e62249
parenta21e81a378db39b5b96ee75d4e0eb2c2daeddedb (diff)
correct mistake
-rw-r--r--addons/smtp-mail.sh32
1 files changed, 2 insertions, 30 deletions
diff --git a/addons/smtp-mail.sh b/addons/smtp-mail.sh
index e11891e9..7a0a4514 100644
--- a/addons/smtp-mail.sh
+++ b/addons/smtp-mail.sh
@@ -56,7 +56,7 @@ PROTOCOL=$(whiptail --title "$TITLE" --nocancel --menu \
$MENU_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
"SSL" "" \
"STARTTLS" "" \
-"none" "" 3>&1 1>&2 2>&3)
+"NO-ENCRYPTION" "" 3>&1 1>&2 2>&3)
if [ -z "$PROTOCOL" ]
then
@@ -70,35 +70,7 @@ case "$PROTOCOL" in
"STARTTLS")
DEFAULT_PORT=587
;;
- "none")
- DEFAULT_PORT=25
- ;;
- *)
- ;;
-esac
-
-
-# Enter if you want to use ssl
-PROTOCOL="$(whiptail --title "$TITLE" --nocancel --menu \
-"Please choose the encryption protocol for your mailserver.
-$MENU_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
-"SSL" "" \
-"STARTTLS" "" \
-"NO ENCRYPTION" "" 3>&1 1>&2 2>&3)
-
-if [ -z "$PROTOCOL" ]
-then
- exit 1
-fi
-
-case "$PROTOCOL" in
- "SSL")
- DEFAULT_PORT=465
- ;;
- "STARTTLS")
- DEFAULT_PORT=587
- ;;
- "NO ENCRYPTION")
+ "NO-ENCRYPTION")
DEFAULT_PORT=25
;;
*)