Make Webmin optional and move some scripts (#1349)

Signed-off-by: enoch85 <github@hanssonit.se>

1 files changed, 10 insertions, 14 deletions

diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
index 1cdfb656..516649d4 100644
--- a/nextcloud_install_production.sh
+++ b/nextcloud_install_production.sh
@@ -66,7 +66,7 @@ debug_mode
 root_check
 
 # Set locales
-run_script STATIC locales
+run_script ADDONS locales
 
 # Test RAM size (2GB min) + CPUs (min 1)
 ram_check 2 Nextcloud
@@ -163,7 +163,7 @@ install_if_not build-essential
 # Just check if the function works and run disk setup
 if home_sme_server
 then
-    run_script STATIC format-sda-nuc-server
+    run_script DISK format-sda-nuc-server
 else
 # Set dual or single drive setup
 msg_box "This VM is designed to run with two disks, one for OS and one for DATA. This will get you the best performance since the second disk is using ZFS which is a superior filesystem.
@@ -178,15 +178,15 @@ choice=$(whiptail --title "Choose disk format" --radiolist "How would you like t
 
 case "$choice" in
     "2 Disks Auto")
-        run_script STATIC format-sdb
+        run_script DISK format-sdb
         # Change to zfs-mount-generator
-        run_script STATIC change-to-zfs-mount-generator
+        run_script DISK change-to-zfs-mount-generator
 
     ;;
     "2 Disks Manual")
-        run_script STATIC format-chosen
+        run_script DISK format-chosen
         # Change to zfs-mount-generator
-        run_script STATIC change-to-zfs-mount-generator
+        run_script DISK change-to-zfs-mount-generator
     ;;
     "1 Disk")
         print_text_in_color "$IRed" "1 Disk setup chosen."
@@ -235,7 +235,7 @@ do
 done
 
 # Check current repo
-run_script STATIC locate_mirror
+run_script ADDONS locate_mirror
 
 # Install PostgreSQL
 # sudo add-apt-repository "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main"
@@ -473,7 +473,7 @@ echo "pgsql.log_notice = 0"
 } >> "$PHP_FPM_DIR"/conf.d/20-pdo_pgsql.ini
 
 # Install Redis (distrubuted cache)
-run_script STATIC redis-server-ubuntu
+run_script ADDONS redis-server-ubuntu
 
  # Install smbclient
  # php"$PHPVER"-smbclient does not yet work in PHP 7.4
@@ -704,8 +704,7 @@ choice=$(whiptail --title "Install apps or software" --checklist "Automatically
 "Text" "" ON \
 "Mail" "" ON \
 "Deck" "" ON \
-"Group-Folders" "" ON \
-"Webmin" "" ON 3>&1 1>&2 2>&3)
+"Group-Folders" "" ON 3>&1 1>&2 2>&3)
 
 case "$choice" in
     *"Calendar"*)
@@ -740,9 +739,6 @@ case "$choice" in
     *"Group-Folders"*)
         install_and_enable_app groupfolders
     ;;&
-    *"Webmin"*)
-        run_script APP webmin
-    ;;&
     *)
     ;;
 esac
@@ -752,7 +748,7 @@ check_command curl_to_dir "$GITHUB_REPO" nextcloud-startup-script.sh "$SCRIPTS"
 check_command curl_to_dir "$GITHUB_REPO" lib.sh "$SCRIPTS"
 download_script STATIC instruction
 download_script STATIC history
-download_script STATIC static_ip
+download_script NETWORK static_ip
 
 if home_sme_server
 then