mirror of
https://github.com/nextcloud/vm.git
synced 2025-10-26 11:27:32 +00:00
Upgrade OS --> 24.04 (#2623)
This commit is contained in:
Daniel Hansson
GitHub
parent
fba7709068
commit
b53b1441c0
16
CHANGELOG.md
16
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
|
||||
|
||||
|
||||
10
README.md
10
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
|
||||
|
||||
|
||||
#### Adminer (Database Administration) *not default*
|
||||
|
||||
#### Webmin (Server Administration GUI) *not default*
|
||||
|
||||
@ -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. \
|
||||
|
||||
@ -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'."
|
||||
|
||||
@ -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/"
|
||||
|
||||
@ -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'."
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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..."
|
||||
|
||||
12
apps/talk.sh
12
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -115,15 +115,15 @@ fi
|
||||
# To get the correct version for the Apache conf file
|
||||
check_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
|
||||
|
||||
# Fix zero file sizes
|
||||
# See https://github.com/nextcloud/server/issues/3056
|
||||
if version 22.04 "$DISTRO" 26.04.10
|
||||
if version 24.04 "$DISTRO" 26.04.10
|
||||
then
|
||||
SETENVPROXY="SetEnv proxy-sendcl 1"
|
||||
fi
|
||||
@ -325,7 +325,7 @@ Please consider showing them your gratitude:
|
||||
https://letsencrypt.org/become-a-sponsor/
|
||||
|
||||
If you want to contribute to these scripts, have a look here:
|
||||
https://github.com/nextcloud/vm/tree/master/lets-encrypt"
|
||||
https://github.com/nextcloud/vm/tree/main/lets-encrypt"
|
||||
exit 0
|
||||
fi
|
||||
else
|
||||
|
||||
43
lib.sh
43
lib.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
|
||||
|
||||
# shellcheck disable=SC2034
|
||||
true
|
||||
@ -87,7 +87,7 @@ Confirm by pressing [ENTER]. Cancel by pressing [ESC]."
|
||||
MENU_GUIDE="Navigate with the [ARROW] keys and confirm by pressing [ENTER]. Cancel by pressing [ESC]."
|
||||
RUN_LATER_GUIDE="You can view this script later by running 'sudo bash $SCRIPTS/menu.sh'."
|
||||
# Repo
|
||||
GITHUB_REPO="https://raw.githubusercontent.com/nextcloud/vm/master"
|
||||
GITHUB_REPO="https://raw.githubusercontent.com/nextcloud/vm/main"
|
||||
STATIC="$GITHUB_REPO/static"
|
||||
LETS_ENC="$GITHUB_REPO/lets-encrypt"
|
||||
APP="$GITHUB_REPO/apps"
|
||||
@ -151,7 +151,7 @@ HTTP_CONF="nextcloud_http_domain_self_signed.conf"
|
||||
HTTPS_CONF="$SITES_AVAILABLE/$SUBDOMAIN.conf"
|
||||
HTTP2_CONF="/etc/apache2/mods-available/http2.conf"
|
||||
# PHP-FPM
|
||||
PHPVER=8.1
|
||||
PHPVER=8.3
|
||||
PHP_FPM_DIR=/etc/php/$PHPVER/fpm
|
||||
PHP_INI=$PHP_FPM_DIR/php.ini
|
||||
PHP_POOL_DIR=$PHP_FPM_DIR/pool.d
|
||||
@ -387,7 +387,7 @@ something is wrong here. Please report this to $ISSUES"
|
||||
# Used in geoblock.sh
|
||||
get_newest_dat_files() {
|
||||
# IPv4
|
||||
IPV4_NAME=$(curl -s https://github.com/nextcloud/vm/tree/master/geoblockdat \
|
||||
IPV4_NAME=$(curl -s https://github.com/nextcloud/vm/tree/main/geoblockdat \
|
||||
| grep -oP '202[0-9]-[01][0-9]-Maxmind-Country-IPv4\.dat' | sort -r | head -1)
|
||||
if [ -z "$IPV4_NAME" ]
|
||||
then
|
||||
@ -413,7 +413,7 @@ get_newest_dat_files() {
|
||||
fi
|
||||
fi
|
||||
# IPv6
|
||||
IPV6_NAME=$(curl -s https://github.com/nextcloud/vm/tree/master/geoblockdat \
|
||||
IPV6_NAME=$(curl -s https://github.com/nextcloud/vm/tree/main/geoblockdat \
|
||||
| grep -oP '202[0-9]-[01][0-9]-Maxmind-Country-IPv6\.dat' | sort -r | head -1)
|
||||
if [ -z "$IPV6_NAME" ]
|
||||
then
|
||||
@ -708,10 +708,10 @@ version(){
|
||||
|
||||
[[ $2 != "$h" && $2 != "$t" ]]
|
||||
}
|
||||
if ! version 20.04 "$DISTRO" 22.04.10
|
||||
if ! version 22.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
print_text_in_color "$IRed" "Your current Ubuntu version is $DISTRO but must be between \
|
||||
20.04 - 22.04.10 to run this script."
|
||||
22.04 - 24.04.10 to run this script."
|
||||
print_text_in_color "$ICyan" "Please contact us for support upgrading your server:"
|
||||
print_text_in_color "$ICyan" "https://www.hanssonit.se/#contact"
|
||||
print_text_in_color "$ICyan" "https://shop.hanssonit.se/"
|
||||
@ -1067,16 +1067,16 @@ remove_from_trusted_domains() {
|
||||
}
|
||||
|
||||
check_distro_version() {
|
||||
# Subṕport Ubuntu 22.0.4 jammy, and Ubuntu 20.04 focal.
|
||||
# Support Ubuntu 22.04 jammy, and Ubuntu 24.04 noble.
|
||||
|
||||
# Check Ubuntu version
|
||||
if [ "${CODENAME}" == "jammy" ] || [ "${CODENAME}" == "focal" ]
|
||||
if [ "${CODENAME}" == "jammy" ] || [ "${CODENAME}" == "noble" ]
|
||||
then
|
||||
OS=1
|
||||
elif lsb_release -i | grep -ic "Ubuntu" &> /dev/null
|
||||
then
|
||||
OS=1
|
||||
elif uname -a | grep -ic "jammy" &> /dev/null || uname -a | grep -ic "focal" &> /dev/null
|
||||
elif uname -a | grep -ic "jammy" &> /dev/null || uname -a | grep -ic "noble" &> /dev/null
|
||||
then
|
||||
OS=1
|
||||
elif uname -v | grep -ic "Ubuntu" &> /dev/null
|
||||
@ -1093,8 +1093,8 @@ You can find the download link here: https://www.ubuntu.com/download/server"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! version 20.04 "$DISTRO" 22.04.10; then
|
||||
msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.10 to run this script."
|
||||
if ! version 22.04 "$DISTRO" 24.04.10; then
|
||||
msg_box "Your current Ubuntu version is $DISTRO but must be between 22.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/product/upgrade-ubuntu-os-between-major-versions/"
|
||||
@ -1253,7 +1253,7 @@ version(){
|
||||
|
||||
[[ $2 != "$h" && $2 != "$t" ]]
|
||||
}
|
||||
if version 20.04 "$DISTRO" 22.04.10
|
||||
if version 22.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
print_text_in_color "$ICyan" "Testing if network is OK..."
|
||||
if site_200 github.com
|
||||
@ -1278,7 +1278,7 @@ then
|
||||
fi
|
||||
fi
|
||||
else
|
||||
msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.10 to run this script."
|
||||
msg_box "Your current Ubuntu version is $DISTRO but must be between 22.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/"
|
||||
@ -1450,7 +1450,7 @@ If it still fails, please report this issue to: $ISSUES."
|
||||
fi
|
||||
}
|
||||
|
||||
# Run any script in ../master
|
||||
# Run any script in ../main
|
||||
# call like: run_main_script name_of_script
|
||||
run_main_script() {
|
||||
run_script GITHUB_REPO "${1}"
|
||||
@ -1542,7 +1542,7 @@ or experience other issues then please report this to $ISSUES"
|
||||
|
||||
# Download the latest updater
|
||||
# cd $NCPATH
|
||||
# curl sLO https://github.com/nextcloud/updater/archive/master.zip
|
||||
# curl sLO https://github.com/nextcloud/updater/archive/main.zip
|
||||
# install_if_not unzip
|
||||
# unzip -q master.zip
|
||||
# rm master.zip*
|
||||
@ -2100,6 +2100,15 @@ then
|
||||
elif grep 8.3 <<< "$GETPHP" >/dev/null 2>&1
|
||||
then
|
||||
export PHPVER=8.3
|
||||
elif grep 8.4 <<< "$GETPHP" >/dev/null 2>&1
|
||||
then
|
||||
export PHPVER=8.4
|
||||
elif grep 8.5 <<< "$GETPHP" >/dev/null 2>&1
|
||||
then
|
||||
export PHPVER=8.5
|
||||
elif grep 8.6 <<< "$GETPHP" >/dev/null 2>&1
|
||||
then
|
||||
export PHPVER=8.6
|
||||
fi
|
||||
|
||||
# Export other PHP variables based on PHPVER
|
||||
@ -2160,7 +2169,7 @@ add_trusted_key_and_repo() {
|
||||
check_distro_version
|
||||
|
||||
# Do the magic
|
||||
if version 22.04 "$DISTRO" 22.04.10
|
||||
if version 22.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
# New recommended way not using apt-key
|
||||
print_text_in_color "$ICyan" "Adding trusted key in /etc/apt/keyrings/$1..."
|
||||
|
||||
@ -57,7 +57,7 @@ fi
|
||||
# Download the driver before it's removed (no internet when it's removed)
|
||||
if [ ! -f "$INSTALLDIR"/r8125-"$RVERSION".tar.bz2 ]
|
||||
then
|
||||
curl_to_dir https://github.com/nextcloud/vm/raw/master/network/asusnuc r8125-"$RVERSION".tar.bz2 "$INSTALLDIR"
|
||||
curl_to_dir https://github.com/nextcloud/vm/raw/main/network/asusnuc r8125-"$RVERSION".tar.bz2 "$INSTALLDIR"
|
||||
fi
|
||||
|
||||
# Install latest driver
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
true
|
||||
SCRIPT_NAME="Set trusted domain"
|
||||
# shellcheck source=lib.sh
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
|
||||
|
||||
# Removed in NC 26.0.0.
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
#########
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
# Prefer IPv4 for apt
|
||||
echo 'Acquire::ForceIPv4 "true";' >> /etc/apt/apt.conf.d/99force-ipv4
|
||||
@ -41,7 +41,7 @@ SCRIPT_NAME="Nextcloud Install Script"
|
||||
SCRIPT_EXPLAINER="This script is installing all requirements that are needed for Nextcloud to run.
|
||||
It's the first of two parts that are necessary to finish your customized Nextcloud installation."
|
||||
# shellcheck source=lib.sh
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
|
||||
|
||||
# Check for errors + debug code and abort if something isn't right
|
||||
# 1 = ON
|
||||
@ -61,9 +61,9 @@ is_process_running apt
|
||||
is_process_running dpkg
|
||||
|
||||
# Check distribution and version
|
||||
if ! version 22.04 "$DISTRO" 22.04.10
|
||||
if ! version 24.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
msg_box "This script can only be run on Ubuntu 22.04 (server)."
|
||||
msg_box "This script can only be run on Ubuntu 24.04 (server)."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -798,7 +798,7 @@ then
|
||||
|
||||
SetEnv HOME $NCPATH
|
||||
SetEnv HTTP_HOME $NCPATH
|
||||
|
||||
|
||||
# Disable HTTP TRACE method.
|
||||
TraceEnable off
|
||||
# Disable HTTP TRACK method.
|
||||
@ -815,13 +815,6 @@ HTTP_CREATE
|
||||
print_text_in_color "$IGreen" "$SITES_AVAILABLE/$HTTP_CONF was successfully created."
|
||||
fi
|
||||
|
||||
# Fix zero file sizes
|
||||
# See https://github.com/nextcloud/server/issues/3056
|
||||
if version 22.04 "$DISTRO" 26.04.10
|
||||
then
|
||||
SETENVPROXY="SetEnv proxy-sendcl 1"
|
||||
fi
|
||||
|
||||
# Generate $TLS_CONF
|
||||
if [ ! -f "$SITES_AVAILABLE"/"$TLS_CONF" ]
|
||||
then
|
||||
@ -892,7 +885,7 @@ then
|
||||
|
||||
SetEnv HOME $NCPATH
|
||||
SetEnv HTTP_HOME $NCPATH
|
||||
|
||||
|
||||
# Disable HTTP TRACE method.
|
||||
TraceEnable off
|
||||
# Disable HTTP TRACK method.
|
||||
@ -904,9 +897,10 @@ then
|
||||
<IfModule mod_reqtimeout.c>
|
||||
RequestReadTimeout body=0
|
||||
</IfModule>
|
||||
|
||||
# Avoid zero byte files (only works in Ubuntu 22.04 -->>)
|
||||
$SETENVPROXY
|
||||
|
||||
# Avoid zero byte files (only works in Ubuntu 24.04 -->>)
|
||||
# See https://github.com/nextcloud/server/issues/3056
|
||||
SetEnv proxy-sendcl 1
|
||||
|
||||
### LOCATION OF CERT FILES ###
|
||||
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
|
||||
@ -1047,11 +1041,11 @@ fi
|
||||
# Fix Realtek on PN51
|
||||
if asuspn51
|
||||
then
|
||||
if ! version 22.04 "$DISTRO" 22.04.10
|
||||
if ! version 24.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
# Upgrade Realtek drivers
|
||||
print_text_in_color "$ICyan" "Upgrading Realtek firmware..."
|
||||
curl_to_dir https://raw.githubusercontent.com/nextcloud/vm/master/network/asusnuc pn51.sh "$SCRIPTS"
|
||||
curl_to_dir https://raw.githubusercontent.com/nextcloud/vm/main/network/asusnuc pn51.sh "$SCRIPTS"
|
||||
bash "$SCRIPTS"/pn51.sh
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
# 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="Nextcloud Update Script"
|
||||
# shellcheck source=lib.sh
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
|
||||
|
||||
# Get all needed variables from the library
|
||||
ncdb
|
||||
@ -32,10 +32,10 @@ root_check
|
||||
is_process_running apt
|
||||
is_process_running dpkg
|
||||
|
||||
# Automatically restart services (Ubuntu 22.04)
|
||||
if ! version 16.04.10 "$DISTRO" 20.04.10
|
||||
# Automatically restart services (Ubuntu 24.04)
|
||||
if ! version 16.04.10 "$DISTRO" 22.04.10
|
||||
then
|
||||
if [ ! -f /etc/needrestart/needrestart.conf ]
|
||||
if [ ! -f /etc/needrestart/needrestart.conf ]
|
||||
then
|
||||
install_if_not needrestart
|
||||
fi
|
||||
@ -364,11 +364,11 @@ fi
|
||||
# Fix Realtek on PN51
|
||||
if asuspn51
|
||||
then
|
||||
if ! version 22.04 "$DISTRO" 22.04.10
|
||||
if ! version 24.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
# Upgrade Realtek drivers
|
||||
print_text_in_color "$ICyan" "Upgrading Realtek firmware..."
|
||||
curl_to_dir https://raw.githubusercontent.com/nextcloud/vm/master/network/asusnuc pn51.sh "$SCRIPTS"
|
||||
curl_to_dir https://raw.githubusercontent.com/nextcloud/vm/main/network/asusnuc pn51.sh "$SCRIPTS"
|
||||
bash "$SCRIPTS"/pn51.sh
|
||||
fi
|
||||
fi
|
||||
@ -384,7 +384,7 @@ then
|
||||
then
|
||||
bash "$NETDATA_UPDATER_PATH"
|
||||
else
|
||||
curl_to_dir https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/ netdata-updater.sh "$SCRIPTS"
|
||||
curl_to_dir https://raw.githubusercontent.com/netdata/netdata/main/packaging/installer/ netdata-updater.sh "$SCRIPTS"
|
||||
bash "$SCRIPTS"/netdata-updater.sh
|
||||
rm -f "$SCRIPTS"/netdata-updater.sh
|
||||
fi
|
||||
@ -419,7 +419,7 @@ then
|
||||
rm -f /tmp/channel.xml
|
||||
fi
|
||||
|
||||
# Update Redis PHP extension (18.04 --> 20.04 since 16.04 already is deprecated in the top of this script)
|
||||
# Update Redis PHP extension (18.04 -->, since 16.04 already is deprecated in the top of this script)
|
||||
print_text_in_color "$ICyan" "Trying to upgrade the Redis PECL extension..."
|
||||
|
||||
# Check current PHP version
|
||||
|
||||
@ -9,7 +9,7 @@ So, please report back! 🚀
|
||||
|
||||
## How to run this inside my NcVM?
|
||||
We have prepared a menu for you to choose from available options. You can download the menu with the following command:<br>
|
||||
`sudo wget https://raw.githubusercontent.com/nextcloud/vm/master/not-supported/not-supported.sh -P /var/scripts`<br>
|
||||
`sudo wget https://raw.githubusercontent.com/nextcloud/vm/main/not-supported/not-supported.sh -P /var/scripts`<br>
|
||||
After downloading the menu, you just run it with the following command:<br>
|
||||
`sudo bash /var/scripts/not-supported.sh`<br>
|
||||
Running the not-supported script will show the menu with the latest options to choose from.
|
||||
|
||||
@ -220,7 +220,7 @@ mkdir -p "$SCRIPTS"
|
||||
# Insert the new lines into pihole-update.sh
|
||||
cat << PIHOLE_UPDATE > "$SCRIPTS/pihole-update.sh"
|
||||
#!/bin/bash
|
||||
. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
|
||||
. <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
|
||||
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
|
||||
notify_admin_gui "Starting the Pi-hole update." "You will be notified when it is done."
|
||||
# Create backup first
|
||||
@ -313,8 +313,8 @@ a2enmod ssl
|
||||
a2enmod proxy
|
||||
a2enmod proxy_http
|
||||
|
||||
# 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
|
||||
|
||||
@ -907,7 +907,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..."
|
||||
|
||||
@ -8,7 +8,7 @@ SCRIPT_NAME="TPM2 Unlock"
|
||||
SCRIPT_EXPLAINER="This script helps automatically unlocking the root partition during boot \
|
||||
and securing your GRUB (bootloader)."
|
||||
# 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)
|
||||
|
||||
# Check for errors + debug code and abort if something isn't right
|
||||
# 1 = ON
|
||||
|
||||
@ -100,18 +100,18 @@ then
|
||||
fi
|
||||
|
||||
# Install requirements
|
||||
if version 20.04 "$DISTRO" 20.04.10
|
||||
if version 22.04 "$DISTRO" 22.04.10
|
||||
then
|
||||
# https://github.com/matiasdelellis/facerecognition/wiki/PDlib-Installation#ubuntu-focal
|
||||
# https://github.com/matiasdelellis/facerecognition/wiki/PDlib-Installation#ubuntu-jammy
|
||||
add_trusted_key_and_repo "repo.gpg.key" \
|
||||
"https://repo.delellis.com.ar" \
|
||||
"https://repo.delellis.com.ar" \
|
||||
"focal focal" \
|
||||
"facerecognition-pdlib.list"
|
||||
install_if_not php"$PHPVER"-pdlib
|
||||
elif version 22.04 "$DISTRO" 22.04.10
|
||||
elif version 24.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
# https://github.com/matiasdelellis/facerecognition/wiki/PDlib-Installation#ubuntu-jammy
|
||||
# https://github.com/matiasdelellis/facerecognition/wiki/PDlib-Installation#ubuntu-noble
|
||||
add_trusted_key_and_repo "repo.gpg.key" \
|
||||
"https://repo.delellis.com.ar" \
|
||||
"https://repo.delellis.com.ar" \
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -124,10 +124,10 @@ then
|
||||
check_php
|
||||
# Install imagick
|
||||
install_if_not php"$PHPVER"-imagick
|
||||
if version 22.04 "$DISTRO" 22.04.10
|
||||
if version 24.04 "$DISTRO" 24.04.10
|
||||
then
|
||||
install_if_not libmagickcore-6.q16-6-extra
|
||||
elif version 20.04 "$DISTRO" 20.04.10
|
||||
elif version 22.04 "$DISTRO" 22.04.10
|
||||
then
|
||||
install_if_not libmagickcore-6.q16-3-extra
|
||||
fi
|
||||
|
||||
@ -20,7 +20,7 @@ fi
|
||||
mkdir -p /var/scripts
|
||||
if ! [ -f /var/scripts/lib.sh ]
|
||||
then
|
||||
if ! curl -sfL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh -o /var/scripts/lib.sh
|
||||
if ! curl -sfL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh -o /var/scripts/lib.sh
|
||||
then
|
||||
print_text_in_color "$IRed" "You don't seem to have an internet \
|
||||
connection and the local lib isn't available. Hence you cannot run this script."
|
||||
@ -28,7 +28,7 @@ connection and the local lib isn't available. Hence you cannot run this script."
|
||||
fi
|
||||
elif ! [ -f /var/scripts/nextcloud-startup-script.sh ]
|
||||
then
|
||||
curl -sfL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh -o /var/scripts/lib.sh
|
||||
curl -sfL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh -o /var/scripts/lib.sh
|
||||
fi
|
||||
|
||||
# shellcheck source=lib.sh
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
true
|
||||
SCRIPT_NAME="Test Connection (old)"
|
||||
# shellcheck source=lib.sh
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
|
||||
|
||||
# This is needed since we removed this from the startup script, or changed name so it can't be downloaded anymore
|
||||
msg_box "You are running an outdated release.
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
true
|
||||
SCRIPT_NAME="Update Server + Nextcloud"
|
||||
# shellcheck source=lib.sh
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
|
||||
source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh)
|
||||
|
||||
# Check for errors + debug code and abort if something isn't right
|
||||
# 1 = ON
|
||||
|
||||
@ -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
|
||||
|
||||
#########
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
# shellcheck source=lib.sh
|
||||
# shellcheck disable=SC2046
|
||||
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)
|
||||
|
||||
# Check for errors + debug code and abort if something isn't right
|
||||
# 1 = ON
|
||||
|
||||
@ -14,7 +14,7 @@ Go to [https://localhost:8080/](https://localhost:8080/) and access Nextcloud wi
|
||||
- Clones https://github.com/nextcloud/vm
|
||||
- Runs `yes no | sudo bash nextcloud_install_production.sh` which uses the default values for each prompt
|
||||
|
||||
See https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh for default values.
|
||||
See https://raw.githubusercontent.com/nextcloud/vm/main/lib.sh for default values.
|
||||
|
||||
# Special thanks to
|
||||
@gjgd for providing https://github.com/gjgd/vagrant-nextcloud which this is based upon
|
||||
|
||||
Loading…
Reference in New Issue
Block a user