Merge branch 'main' into desec-apps

Author: enoch85

.github/ISSUE_TEMPLATE/bug.yml

@@ -38,7 +38,7 @@ body:
     id: screenshots
     attributes:
       label: Screenshots, Videos, or Pastebins
-      description: If applicable, add screenshots and/or a short video to help explain your problem. You can use https://0bin.net for long error messages or logs.
+      description: If applicable, add screenshots and/or a short video to help explain your problem. You can use https://paste.sh for long error messages or logs.
   - type: textarea
     id: additional-context
     attributes:

.github/workflows/check-code-with-shellcheck.yml

@@ -10,7 +10,7 @@ jobs:
     name: Github Actions
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
     - name: Run Shellcheck
       uses: ludeeus/action-shellcheck@master
       with:

.github/workflows/reviewdog.yml

@@ -11,7 +11,7 @@ jobs:
     name: Shellcheck testing
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: shellcheck
         uses: reviewdog/action-shellcheck@v1
         with:
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: spelling or typos
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
       - name: misspell
         uses: reviewdog/action-misspell@v1
         with:

CHANGELOG.md

@@ -2,14 +2,21 @@
 
 **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!
 
 ### Different versions
 If you run Hyper-V or want 500 GB, 1 TB or 2 TB VM you can download it from [T&M Hansson IT's shop](https://shop.hanssonit.se/product-category/virtual-machine/nextcloud/). 
 
+## All future releases
+
+### Full changelog:
+- [VM](https://github.com/nextcloud/vm/releases/)
+- [Nextcloud](https://nextcloud.com/changelog/)
+
+
 ## 26.0.0
 
 ### Full changelog:
@@ -241,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...
 
@@ -265,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:
@@ -292,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:
@@ -305,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:
@@ -377,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
 
 
@@ -415,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:
@@ -438,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

@@ -17,12 +17,12 @@ Server installation. Simplified. :cloud:
 --------------------
 
 ## Dependencies:
-(Ubuntu Server 22.04 LTS *minimal* 64-bit)
+(Ubuntu Server 24.04 LTS *minimal* 64-bit)
 <br>
-(Linux Kernel: 5.15)
+(Linux Kernel: 6.8)
 - Apache 2.4
-- PostgreSQL 14
-- PHP-FPM 8.1
+- PostgreSQL 16
+- PHP-FPM 8.3
 - Redis Memcache (latest stable version from PECL)
 - PHP-igbinary (latest stable version from PECL
 - PHP-smbclient (latest stable version from PECL)
@@ -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 [main 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,7 +66,7 @@ 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!
 
@@ -106,17 +106,18 @@ Please report any issues you can find. Improvements are welcome!
 * You? :)
 
 ## Special thanks to
-* [Ezra Holm](https://github.com/ezraholm50) @ [Tech and Me](https://www.techandme.se)
+* Ezra Holm @ [Tech and Me](https://www.techandme.se)
 * [Luis Guzman](https://github.com/Ark74) @ [SwITNet](https://switnet.net)
 * [Stefan Heitmüller](https://github.com/morph027) @ [morph027's Blog](https://morph027.gitlab.io/)
 * [Lorenzo Faleschini](https://github.com/penzoiders)
 * [Georg Großmann](https://github.com/ggeorgg)
 * [liao20081228](https://github.com/liao20081228)
 * [aaaskew](https://github.com/aaaskew)
-
-[Nextcloud Server]: https://bit.ly/2CHIUkA
-[app store]: https://bit.ly/2HUy4v9
-[\*nix]: https://bit.ly/2UaCC7b
-[A+ security-rated]: https://bit.ly/2mvlyJ3
-[Collabora Online]: https://bit.ly/2WjVVZ8
-[ONLYOFFICE]: https://bit.ly/2FA0TKj
+* IP address data powered by [IPinfo](https://ipinfo.io/)
+
+[Nextcloud Server]: http://shortio.hanssonit.se/r1Rx0GqXa9
+[app store]: http://shortio.hanssonit.se/Rz1GEXt9dL
+[\*nix]: http://shortio.hanssonit.se/52hOTQbhdh
+[A+ security-rated]: http://shortio.hanssonit.se/aMTjg0SJi3
+[Collabora Online]: http://shortio.hanssonit.se/IKjBoOfQOT
+[ONLYOFFICE]: http://shortio.hanssonit.se/oRLShCfRK3

addons/0-byte-files.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 true
 SCRIPT_NAME="Check for 0-Byte files"
 # shellcheck source=lib.sh

addons/automatic_updates.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 
 true
 SCRIPT_NAME="Automatic Updates"
@@ -42,7 +42,7 @@ mkdir -p "$VMLOGS"/updates
 crontab -u root -l | { cat; echo "0 $AUT_UPDATES_TIME * 1-12 6 $SCRIPTS/update.sh minor >> $VMLOGS/updates/update-\$(date +\%Y-\%m-\%d_\%H:\%M).log 2>&1"; } | crontab -u root -
 if yesno_box_yes "Do you want to reboot your server after every update? *recommended*"
 then
-    sed -i "s|exit|/sbin/shutdown -r +1|g" "$SCRIPTS"/update.sh
+    sed -i "s|exit|/sbin/shutdown -r +10|g" "$SCRIPTS"/update.sh
     echo "exit" >> "$SCRIPTS"/update.sh
 fi
 

addons/cookielifetime.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 
 true
 SCRIPT_NAME="Set Cookie Lifetime"

addons/database_shrinking.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 # Copyright © 2021 Simon Lindner (https://github.com/szaimen)
 
 true

addons/deSEC/desec.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
 
 true
 SCRIPT_NAME="deSEC Registration"
@@ -140,17 +140,17 @@ 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. \
 The hook files will end up in $SCRIPTS/deSEC, please don't touch that folder unless you know what you're doing. \
 You can read more about it here: https://github.com/desec-io/desec-certbot-hook
 
 Please remember that you still need to open the port you choose to make your server publicly available.
-You can read more about that here: https://goo.gl/iUGE2U"
+You can read more about that here: http://shortio.hanssonit.se/ffOQOXS6Kh"
 
     # Run the TLS script
     run_script LETS_ENC activate-tls