diff --git a/README.md b/README.md index 811742d06..d8164ee8c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This code also generates the [NextCloudPi docker images](https://hub.docker.com/ ## Features * Raspbian 9 stretch - * Nextcloud 13.0.4 + * Nextcloud 14.0.1 * Apache 2.4.25, with HTTP2 enabled * PHP 7.0 (double the speed of PHP5!) * MariaDB 10 diff --git a/etc/ncp-config.d/nc-autoupdate-nc.sh b/etc/ncp-config.d/nc-autoupdate-nc.sh index 7b5bf232d..32ab25379 100644 --- a/etc/ncp-config.d/nc-autoupdate-nc.sh +++ b/etc/ncp-config.d/nc-autoupdate-nc.sh @@ -13,7 +13,7 @@ NOTIFYUSER_=ncp DESCRIPTION="Automatically apply Nextcloud updates" # just change this value and re-activate in update.sh to upgrade users -VERSION=13.0.6 +VERSION=14.0.1 configure() { diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh index ed7a3b718..eee79c791 100644 --- a/etc/ncp-config.d/nc-nextcloud.sh +++ b/etc/ncp-config.d/nc-nextcloud.sh @@ -8,7 +8,7 @@ # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/ # -VER_=13.0.6 +VER_=14.0.1 BETA_=no MAXFILESIZE_=2G MEMORYLIMIT_=768M diff --git a/etc/ncp-config.d/nc-update-nextcloud.sh b/etc/ncp-config.d/nc-update-nextcloud.sh index 523983739..7ae504531 100644 --- a/etc/ncp-config.d/nc-update-nextcloud.sh +++ b/etc/ncp-config.d/nc-update-nextcloud.sh @@ -8,7 +8,7 @@ # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/ # -VERSION_=13.0.6 +VERSION_=14.0.1 DESCRIPTION="Update current instance to a new Nextcloud version" configure() diff --git a/update.sh b/update.sh index 5db37148c..a584e305a 100755 --- a/update.sh +++ b/update.sh @@ -143,13 +143,8 @@ EOF # for non docker images [[ ! -f /.docker-image ]] && { - : - } - - # faster previews - [[ -f /etc/php/7.0/mods-available/imagick.ini ]] || { - apt-get update - apt-get install -y --no-install-recommends php-imagick imagemagick-6-common + # fix locale for Armbian images, for ncp-config + [[ "$LANG" == "" ]] && localectl set-locale LANG=en_US.utf8 } # no-origin policy for enhanced privacy @@ -183,6 +178,14 @@ EOF service mysql restart } + # update to NC14.0.1 + F="$CONFDIR"/nc-autoupdate-nc.sh + grep -q '^ACTIVE_=yes$' "$F" && { + cd "$CONFDIR" &>/dev/null + activate_script nc-autoupdate-nc.sh + cd - &>/dev/null + } + # fix locale for Armbian images, for ncp-config [[ "$LANG" == "" ]] && localectl set-locale LANG=en_US.utf8