From f9ac001b44ec51f69f98f9d942f7d690dc4dce1b Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Sat, 3 Oct 2020 16:49:24 +0200
Subject: [PATCH 1/2] remove smtp-mail from the not-supported menu again

---
 not-supported/not-supported_menu.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/not-supported/not-supported_menu.sh b/not-supported/not-supported_menu.sh
index ad3afa20..dac6aae0 100644
--- a/not-supported/not-supported_menu.sh
+++ b/not-supported/not-supported_menu.sh
@@ -17,14 +17,6 @@ debug_mode
 # Must be root
 root_check
 
-# Set the startup switch
-if [ -f "$SCRIPTS/nextcloud-startup-script.sh" ]
-then
-    STARTUP_SWITCH="ON"
-else
-    STARTUP_SWITCH="OFF"
-fi
-
 # Main menu
 choice=$(whiptail --title "$TITLE" --checklist \
 "This is the Not-supported Menu of the Nextcloud VM!
@@ -34,16 +26,10 @@ So please run them on your own risk. Feedback is more than welcome, though and c
 
 Choose which one you want to execute.
 $CHECKLIST_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
-"SMTP Mail" "(Enable beeing notified by mail from your server)" "$STARTUP_SWITCH" \
 "PLEX Media Server" "(Multimedia server application)" OFF \
 "SMB-server" "(Create and manage a SMB-server on OS level)" OFF 3>&1 1>&2 2>&3)
 
 case "$choice" in
-    *"SMTP Mail"*)
-        clear
-        print_text_in_color "$ICyan" "Downloading the SMTP Mail script..."
-        run_script ADDONS smtp-mail
-    ;;&
     *"PLEX Media Server"*)
         print_text_in_color "$ICyan" "Downloading the PLEX Media Server script..."
         run_script NOT_SUPPORTED plexmediaserver

From 641fdfeeeb9a4072b1be0e41cae9aa59e97c9ce3 Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Sat, 3 Oct 2020 16:52:02 +0200
Subject: [PATCH 2/2] insert smtp-mail into server_configuration

---
 menu/server_configuration.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/menu/server_configuration.sh b/menu/server_configuration.sh
index 2deaebcc..93bf0cec 100644
--- a/menu/server_configuration.sh
+++ b/menu/server_configuration.sh
@@ -42,6 +42,7 @@ $CHECKLIST_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "DDclient Configuration" "(Use ddclient for automatic DDNS updates)" OFF \
 "Activate TLS" "(Enable HTTPS with Let's Encrypt)" "$ACTIVATE_TLS_SWITCH" \
 "Automatic updates" "(Automatically update your server every week on Sundays)" OFF \
+"SMTP Mail" "(Enable beeing notified by mail from your server)" "$STARTUP_SWITCH" \
 "Disk Check" "(Check for S.M.A.R.T errors on your disks every week on Mondays)" OFF 3>&1 1>&2 2>&3)
 
 case "$choice" in
@@ -93,6 +94,11 @@ https://www.techandme.se/open-port-80-443/" "$SUBTITLE"
         print_text_in_color "$ICyan" "Downloading the Automatic Updates script..."
         run_script ADDONS automatic_updates
     ;;&
+    *"SMTP Mail"*)
+        clear
+        print_text_in_color "$ICyan" "Downloading the SMTP Mail script..."
+        run_script ADDONS smtp-mail
+    ;;&
     *"Disk Check"*)
         clear
         print_text_in_color "$ICyan" "Downloading the Disk Check script..."