Upgrade OS --> 24.04 (#2623)

Author: enoch85

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 **Please note that BOTH disks need to be imported for the VM to function properly.**
 
-- Check the latest commits here: https://github.com/nextcloud/vm/commits/master
+- Check the latest commits here: https://github.com/nextcloud/vm/commits/main
 - Documentation can be found here: https://docs.hanssonit.se/s/W6fMouPiqQz3_Mog/virtual-machines-vm/d/W7Du9uPiqQz3_Mr1/nextcloud-vm-machine-configuration
 
 PR's are more than welcome. Happy Nextclouding!
@@ -248,7 +248,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - Add the Azure kernel for Hyper-V VMs
 - Shorten the time files are stored in trashbin (can still be configured)
 - Escape all Apache Log dirs correctly
-- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported)
+- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported)
 - Minor bugfixes and improvements
 - And more...
 
@@ -272,7 +272,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - ClamAV - improve weekly full-scan tremendously
 - Update geoblock database - april
 - Speed up the network check if the network already works
-- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported)
+- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported)
 - Minor bugfixes and improvements
 
 ### Full changelog:
@@ -299,7 +299,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - Don't break update when enabling app
 - Fix not enabled PECL extensions
 - Prevent apps from breaking the update due to incompatibility
-- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported)
+- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported)
 - Minor bugfixes and improvements
 
 ### Full changelog:
@@ -312,7 +312,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - Ask to get the latest `update.sh` script when running updates from `menu.sh`
 - Allow to reinstall Bitwarden RS also if local files are present
 - Updated geoblock database files
-- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported)
+- Made some enhancements to scripts in the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported)
 - Minor bugfixes and improvements
 
 ### Full changelog:
@@ -384,7 +384,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - Allow to reinstall automatic updates
 - Improved partition check during the install-script
 - Fixed some typo's
-- Added more options to the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported) and made some enhancements
+- Added more options to the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported) and made some enhancements
 - Minor bugfixes and improvements
 
 
@@ -422,7 +422,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - Fixed problems with static-ip
 - Added Docker migrate script
 - Fixed and issue with ClamAV
-- Added more options to the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported) and made some enhancements
+- Added more options to the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported) and made some enhancements
 - Minor bugfixes and improvements
 
 ### Full changelog:
@@ -445,7 +445,7 @@ This release is quite huge, including Ubuntu 22.04 (minimal), PHP-FPM 8.1, and P
 - SMBmount: Introduce the option to customize the mount before adding as external storage to Nextcloud
 - SMBmount: Add the option to utilize inotify to actively watch over externally changed files and folders
 - Repository: cleanup by removing duplicate scripts and not-needed functions
-- Repository: added the [not-supported folder](https://github.com/nextcloud/vm/tree/master/not-supported) with additional options like creating a SMB-server
+- Repository: added the [not-supported folder](https://github.com/nextcloud/vm/tree/main/not-supported) with additional options like creating a SMB-server
 
 - Minor bugfixes and improvements
 

README.md

@@ -32,15 +32,15 @@ Server installation. Simplified. :cloud:
 * [Create a PR](https://help.github.com/articles/creating-a-pull-request/) and improve the code
 * Report [your issue](https://github.com/nextcloud/vm/issues/new)
 * Help us with [existing issues](https://github.com/nextcloud/vm/issues)
-* Test what's not yet released into the stable VM. Please have a look at [this subfolder](https://github.com/nextcloud/vm/tree/master/not-supported) for further information.
+* Test what's not yet released into the stable VM. Please have a look at [this subfolder](https://github.com/nextcloud/vm/tree/main/not-supported) for further information.
 * Write scripts so that the release process becomes automated with [Vagrant](https://www.vagrantup.com/docs/getting-started/), [Terraform](https://www.terraform.io/) or similar
 * **[Donate](https://shop.hanssonit.se/product-category/donate/) or buy our [pre-configured VMs](https://shop.hanssonit.se/product-category/virtual-machine/): 500 GB, 1 TB, 2TB for both VMware, Hyper-V and [more](https://docs.hanssonit.se/s/W6fMouPiqQz3_Mog/virtual-machines-vm/d/W7Du9uPiqQz3_Mr1/nextcloud-vm-machine-configuration?currentPageId=bls17dahv0jgrltpif20)**
 
 **FYI**
 
-Developed by [Daniel Hansson](https://github.com/enoch85) and the Nextcloud community. Nextcloud GmbH does not offer support for the VM in the [master branch](https://github.com/nextcloud/vm/tree/master) (full-version), as we only support manual tarball/zip-package installations. You can download the official Nextcloud VM appliance ([also from this repo](https://github.com/nextcloud/vm/tree/official-basic-vm)) from [our website](https://download.nextcloud.com/vm/Official-Nextcloud-VM.zip) to get a stripped down version for testing if you rather want to skip all the manual steps in our documentation.
+Developed by [Daniel Hansson](https://github.com/enoch85) and the Nextcloud community. Nextcloud GmbH does not offer support for the VM in the [maain branch](https://github.com/nextcloud/vm/tree/main) (full-version), as we only support manual tarball/zip-package installations. You can download the official Nextcloud VM appliance ([also from this repo](https://github.com/nextcloud/vm/tree/official-basic-vm)) from [our website](https://download.nextcloud.com/vm/Official-Nextcloud-VM.zip) to get a stripped down version for testing if you rather want to skip all the manual steps in our documentation.
 
-If you want support regarding the full-version VM in master, please contact our partner [Hansson IT](https://www.hanssonit.se/nextcloud-vm).
+If you want support regarding the full-version VM in main, please contact our partner [Hansson IT](https://www.hanssonit.se/nextcloud-vm).
 
 ## Full documentation
 * [VM](https://docs.hanssonit.se/s/W6fMouPiqQz3_Mog/virtual-machines-vm/d/W6fMquPiqQz3_Moi/nextcloud-vm) (the easiest option)
@@ -66,13 +66,13 @@ Please keep in mind that this is only intended for testing and might crash your
 
 The `nextcloud_install_production.sh` script can be run as part of Vagrant provisioning.
 
-See [this subrepo](https://github.com/nextcloud/vm/tree/master/vagrant) for more information.
+See [this subrepo](https://github.com/nextcloud/vm/tree/main/vagrant) for more information.
 
 Please report any issues you can find. Improvements are welcome!
 
 ## First look
 #### Nextcloud
-![alt tag](https://github.com/nextcloud/nextcloud.com/blob/master/assets/img/features/VMwelcome.png)
+![alt tag](https://github.com/nextcloud/nextcloud.com/blob/main/assets/img/features/VMwelcome.png)
 #### Adminer (Database Administration) *not default*
 ![alt tag](https://i.imgur.com/tiF4chg.png)
 #### Webmin (Server Administration GUI) *not default*

addons/deSEC/desec.sh

@@ -140,9 +140,9 @@ then
     # Add DNS renewals with the deSEC hoock script
     print_text_in_color "$ICyan" "Preparing for DNS-renewals..."
     mkdir -p "$SCRIPTS"/deSEC
-    curl_to_dir "https://raw.githubusercontent.com/nextcloud/vm/master/addons/deSEC" "hook.sh" "$SCRIPTS"/deSEC
+    curl_to_dir "https://raw.githubusercontent.com/nextcloud/vm/main/addons/deSEC" "hook.sh" "$SCRIPTS"/deSEC
     chmod +x "$SCRIPTS"/deSEC/hook.sh
-    curl_to_dir "https://raw.githubusercontent.com/nextcloud/vm/master/addons/deSEC" ".dedynauth" "$SCRIPTS"/deSEC
+    curl_to_dir "https://raw.githubusercontent.com/nextcloud/vm/main/addons/deSEC" ".dedynauth" "$SCRIPTS"/deSEC
     check_command sed -i "s|DEDYN_TOKEN=.*|DEDYN_TOKEN=$DEDYNAUTHTOKEN|g" "$SCRIPTS"/deSEC/.dedynauth
     check_command sed -i "s|DEDYN_NAME=.*|DEDYN_NAME=$DEDYNDOMAIN|g" "$SCRIPTS"/deSEC/.dedynauth
     msg_box "DNS updates for deSEC are now set. This means you don't have to open any ports (80|443) for the renewal process since deSEC TLS renewals will be run with a built in hook. \

addons/fix_invalid_modification_time.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
-# Based on: https://raw.githubusercontent.com/nextcloud-gmbh/mtime_fixer_tool_kit/master/solvable_files.sh
+# Based on: https://raw.githubusercontent.com/nextcloud-gmbh/mtime_fixer_tool_kit/main/solvable_files.sh
 
 true
 SCRIPT_NAME="Fix 'Could not update metadata due to invalid modified time'."

addons/redis-server-ubuntu.sh

@@ -16,9 +16,9 @@ debug_mode
 root_check
 
 # Check Ubuntu version
-if ! version 18.04 "$DISTRO" 22.04.10
+if ! version 18.04 "$DISTRO" 24.04.10
 then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 22.04.10 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 24.04.10 to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"

addons/solvable_files.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Based on: https://raw.githubusercontent.com/nextcloud-gmbh/mtime_fixer_tool_kit/master/solvable_files.sh
+# Based on: https://raw.githubusercontent.com/nextcloud-gmbh/mtime_fixer_tool_kit/main/solvable_files.sh
 
 true
 SCRIPT_NAME="Fix 'Could not update metadata due to invalid modified time'."

apps/adminer.sh

@@ -53,11 +53,11 @@ a2enmod ssl
 apt-get update -q4 & spinner_loading
 install_if_not adminer
 curl_to_dir "http://www.adminer.org" "latest.php" "$ADMINERDIR"
-curl_to_dir "https://raw.githubusercontent.com/Niyko/Hydra-Dark-Theme-for-Adminer/master" "adminer.css" "$ADMINERDIR"
+curl_to_dir "https://raw.githubusercontent.com/Niyko/Hydra-Dark-Theme-for-Adminer/main" "adminer.css" "$ADMINERDIR"
 ln -s "$ADMINERDIR"/latest.php "$ADMINERDIR"/adminer.php
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/collabora_docker.sh

@@ -6,7 +6,7 @@ true
 SCRIPT_NAME="Collabora (Docker)"
 SCRIPT_EXPLAINER="This script will install the Collabora Office Server bundled with Docker"
 # shellcheck source=lib.sh
-source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
 # To work with https://github.com/nextcloud/richdocuments/pull/2235
 
 # Check for errors + debug code and abort if something isn't right
@@ -57,7 +57,7 @@ NCDOMAIN=$(nextcloud_occ_no_check config:system:get overwrite.cli.url | sed 's|h
 
 # Curl the library another time to get the correct https_conf
 # shellcheck source=lib.sh
-source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
 
 # Get all needed variables from the library
 nc_update
@@ -135,8 +135,8 @@ a2enmod proxy_http
 a2enmod ssl
 a2enmod headers
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/fail2ban.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
-# Inspired by https://github.com/nextcloud/nextcloudpi/blob/master/etc/nextcloudpi-config.d/fail2ban.sh
+# Inspired by https://github.com/nextcloud/nextcloudpi/blob/main/etc/nextcloudpi-config.d/fail2ban.sh
 
 true
 SCRIPT_NAME="Fail2ban"

apps/imaginary.sh

@@ -2,7 +2,7 @@
 
 # T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 # GNU General Public License v3.0
-# https://github.com/nextcloud/vm/blob/master/LICENSE
+# https://github.com/nextcloud/vm/blob/main/LICENSE
 
 true
 SCRIPT_NAME="Imaginary Docker"

apps/onlyoffice_docker.sh

@@ -152,8 +152,8 @@ a2enmod proxy_http
 a2enmod ssl
 a2enmod headers
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/pico_cms.sh

@@ -214,8 +214,8 @@ a2enmod proxy_http
 a2enmod ssl
 a2enmod headers
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/recognize.sh

@@ -58,7 +58,7 @@ then
 4. Install
 
 We will run the uninstaller for you now, then exit."
-    wget https://raw.githubusercontent.com/nextcloud/vm/master/old/face-recognition.sh && bash face-recognition.sh && rm -f face-recognition.sh
+    wget https://raw.githubusercontent.com/nextcloud/vm/main/old/face-recognition.sh && bash face-recognition.sh && rm -f face-recognition.sh
     exit
 fi
 

apps/smbmount.sh

@@ -77,7 +77,7 @@ then
     msg_box "All $MAX_COUNT slots are occupied. No mounting slots available. Please delete one of the SMB-mounts.
 If you really want to mount more, you can simply download the smb-mount script \
 directly and edit the variable 'MAX_COUNT' to a higher value than $MAX_COUNT by running:
-'curl -sLO https://raw.githubusercontent.com/nextcloud/vm/master/apps/smbmount.sh' # Download the script
+'curl -sLO https://raw.githubusercontent.com/nextcloud/vm/main/apps/smbmount.sh' # Download the script
 'nano smbmount.sh' # Edit MAX_COUNT=$MAX_COUNT to your likings and save the file
 'sudo bash smbmount.sh' # Execute the script." "$SUBTITLE"
     return
@@ -340,7 +340,7 @@ We please you to do the math yourself if the number is high enough for your setu
             fi
 
             # Install the inotify PHP extension
-            # https://github.com/icewind1991/files_inotify/blob/master/README.md
+            # https://github.com/icewind1991/files_inotify/blob/main/README.md
             if ! pecl list | grep -q inotify
             then 
                 print_text_in_color "$ICyan" "Installing the PHP inotify extension..."

apps/talk.sh

@@ -88,10 +88,10 @@ else
     removal_popup "$SCRIPT_NAME"
 fi
 
-# Must be 22.04
-if ! version 20.04 "$DISTRO" 22.04.10
+# Must be 24.04
+if ! version 22.04 "$DISTRO" 24.04.10
 then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.10 to install Talk"
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 22.04 - 24.04.10 to install Talk"
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"
@@ -233,7 +233,7 @@ msg_box "You will now be presented with the option to install the Talk Signaling
 This aims to give you greater performance and ability to have more users in a call at the same time.
 
 You can read more here: 
-https://github.com/strukturag/nextcloud-spreed-signaling/blob/master/README.md
+https://github.com/strukturag/nextcloud-spreed-signaling/blob/main/README.md
 
 We will use apt packages from https://gitlab.com/morph027 which is a trusted contributor to this repository.
 
@@ -398,8 +398,8 @@ mkdir -p /var/www/html/error
 echo "Hi there! :) If you see this page, the Apache2 proxy for $SCRIPT_NAME is up and running." > /var/www/html/error/404_proxy.html
 chown -R www-data:www-data /var/www/html/error
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/tmbitwarden.sh

@@ -181,7 +181,7 @@ USERGROUPID=$(id -g $BITWARDEN_USER)
 sed -i "s|database_docker_volume:.*|database_docker_volume: true|g" "$BITWARDEN_HOME"/bwdata/config.yml
 sed -i "s|LOCAL_UID=.*|LOCAL_UID=$USERID|g" "$BITWARDEN_HOME"/bwdata/env/uid.env
 sed -i "s|LOCAL_GID=.*|LOCAL_GID=$USERGROUPID|g" "$BITWARDEN_HOME"/bwdata/env/uid.env
-# Get Subdomain from config.yml and change it to https
+# Get subdomain from config.yml and change it to https
 SUBDOMAIN=$(grep ^url "$BITWARDEN_HOME"/bwdata/config.yml)
 SUBDOMAIN=${SUBDOMAIN##*url: http://}
 sed -i "s|^url: .*|url: https://$SUBDOMAIN|g" "$BITWARDEN_HOME"/bwdata/config.yml
@@ -240,8 +240,8 @@ a2enmod ssl
 a2enmod headers
 a2enmod remoteip
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/vaultwarden.sh

@@ -122,8 +122,8 @@ a2enmod ssl
 a2enmod headers
 a2enmod remoteip
 
-# Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 22.04.10
+# Only add TLS 1.3 on Ubuntu later than 22.04
+if version 22.04 "$DISTRO" 24.04.10
 then
     TLS13="+TLSv1.3"
 fi

disk/change-to-zfs-mount-generator.sh

@@ -3,9 +3,9 @@
 # T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 
 # https://wiki.archlinux.org/index.php/ZFS#Using_zfs-mount-generator
-# Tested on Ubuntu 20.04
+# Tested on Ubuntu 22.04
 
-# This script came to life when we were having issues with importing the ZFS pool (ncdata) on Ubuntu 20.04.
+# This script came to life when we were having issues with importing the ZFS pool (ncdata) on Ubuntu 22.04.
 # After some forum reading and some digging on Github, this is the result.
 # The intention here is to make the import process more robust, and less prune to fail
 # Essentially, changing from 'zfs-mount.service' to 'zfs-mount-generator' which by many has been working better.
@@ -18,12 +18,12 @@ source /var/scripts/fetch_lib.sh
 # Check if root
 root_check
 
-# Needs to be Ubuntu 20.04 and Multiverse
+# Needs to be Ubuntu 22.04 and Multiverse
 check_distro_version
 check_multiverse
 
 # Import if missing and export again to import it with UUID
-# https://github.com/nextcloud/vm/blob/master/lib.sh#L1233
+# https://github.com/nextcloud/vm/blob/main/lib.sh#L1233
 # Set a different name for the pool (if used outside of this repo)
 # export POOLNAME=ncdata
 zpool_import_if_missing

disk/format-chosen.sh

@@ -10,7 +10,7 @@ source /var/scripts/fetch_lib.sh
 # Check if root
 root_check
 
-# Needs to be Ubuntu 20.04 and Multiverse
+# Needs to be Ubuntu 22.04 and Multiverse
 check_distro_version
 check_multiverse
 

disk/format-sdb.sh

@@ -10,7 +10,7 @@ source /var/scripts/fetch_lib.sh
 # Check if root
 root_check
 
-# Needs to be Ubuntu 20.04 and Multiverse
+# Needs to be Ubuntu 22.04 and Multiverse
 check_distro_version
 check_multiverse
 

geoblockdat/README.md

@@ -1,5 +1,5 @@
 # What is this folder about?
-This folder is only meant for storing GeoIP Legacy Databases which are used by the [geoip script](https://github.com/nextcloud/vm/blob/master/network/geoblock.sh).
+This folder is only meant for storing GeoIP Legacy Databases which are used by the [geoip script](https://github.com/nextcloud/vm/blob/main/network/geoblock.sh).
 
 All .dat files in this folder are from https://www.miyuru.lk/geoiplegacy and converted by Miyuru Sankalpa.