Merge branch 'master' into szaimen-patch-3

This commit is contained in:
Daniel Hansson 2020-10-03 18:44:09 +02:00 committed by GitHub
commit db57a883e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 14 deletions

View File

@ -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..."

View File

@ -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