diff options
author | nachoparker <nacho@ownyourbits.com> | 2020-08-29 03:23:23 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2020-08-29 18:05:40 +0300 |
commit | 3cf269a305082fde9989df6c485132a2d5bb98e1 (patch) | |
tree | a2686c3551358e538e809dff20b8a241b648f506 | |
parent | 4c5b207bbdec9385c58173f1f80a8822f75e7bd6 (diff) |
upgrade to NC19.0.2v1.29.0
Signed-off-by: nachoparker <nacho@ownyourbits.com>
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | bin/ncp-update-nc | 1 | ||||
-rw-r--r-- | bin/ncp/BACKUPS/nc-import-ncp.sh | 2 | ||||
-rw-r--r-- | bin/ncp/CONFIG/nc-nextcloud.sh | 1 | ||||
-rw-r--r-- | etc/library.sh | 2 | ||||
-rw-r--r-- | etc/ncp-config.d/nc-nextcloud.cfg | 2 | ||||
-rw-r--r-- | etc/ncp.cfg | 2 | ||||
-rw-r--r-- | ncp-app/appinfo/info.xml | 2 | ||||
-rw-r--r-- | ncp-previewgenerator/appinfo/info.xml | 2 | ||||
-rw-r--r-- | updates/1.30.0.sh | 31 |
10 files changed, 40 insertions, 7 deletions
@@ -16,7 +16,7 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co ## Features * Debian/Raspbian 10 Buster - * Nextcloud 18.0.7 + * Nextcloud 19.0.2 * Apache 2.4.25, with HTTP2 enabled * PHP 7.3 * MariaDB 10 diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index de09bd39..1e88428f 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -181,6 +181,7 @@ find nextcloud/ -type f -exec chmod 640 {} \; echo "Upgrade..." sudo -u www-data php nextcloud/occ upgrade # && false # test point sudo -u www-data php nextcloud/occ db:add-missing-indices +sudo -u www-data php nextcloud/occ db:add-missing-columns # done #################### diff --git a/bin/ncp/BACKUPS/nc-import-ncp.sh b/bin/ncp/BACKUPS/nc-import-ncp.sh index 7c83da24..823e2703 100644 --- a/bin/ncp/BACKUPS/nc-import-ncp.sh +++ b/bin/ncp/BACKUPS/nc-import-ncp.sh @@ -11,7 +11,7 @@ CFGDIR="/usr/local/etc/ncp-config.d" -configure() +configure() { [[ -f "$FILE" ]] || { echo "export file $FILE does not exist"; return 1; } diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh index c572498f..fb1205bb 100644 --- a/bin/ncp/CONFIG/nc-nextcloud.sh +++ b/bin/ncp/CONFIG/nc-nextcloud.sh @@ -27,6 +27,7 @@ install() $APTINSTALL -t $RELEASE php-smbclient exfat-fuse exfat-utils # for external storage $APTINSTALL -t $RELEASE php${PHPVER}-exif # for gallery $APTINSTALL -t $RELEASE php${PHPVER}-gmp # for bookmarks + $APTINSTALL -t $RELEASE php-bcmath # for LDAP #$APTINSTALL -t imagemagick php${PHPVER}-imagick ghostscript # for gallery diff --git a/etc/library.sh b/etc/library.sh index 04e19392..89ecee1e 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -296,7 +296,7 @@ function clear_password_fields() function apt_install() { apt-get update - apt-get install -y --no-install-recommends -o Dpkg::Options::=--force-confdef + apt-get install -y --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::="--force-confold" "$@" } function notify_admin() diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg index 4822ce05..5adb36ae 100644 --- a/etc/ncp-config.d/nc-nextcloud.cfg +++ b/etc/ncp-config.d/nc-nextcloud.cfg @@ -9,7 +9,7 @@ { "id": "VER", "name": "Version", - "value": "18.0.7" + "value": "19.0.2" }, { "id": "BETA", diff --git a/etc/ncp.cfg b/etc/ncp.cfg index 9f04d8e1..49cf7dc2 100644 --- a/etc/ncp.cfg +++ b/etc/ncp.cfg @@ -1,5 +1,5 @@ { - "nextcloud_version": "18.0.7", + "nextcloud_version": "19.0.2", "php_version": "7.3", "release": "buster" } diff --git a/ncp-app/appinfo/info.xml b/ncp-app/appinfo/info.xml index abdc3011..05a4e2e4 100644 --- a/ncp-app/appinfo/info.xml +++ b/ncp-app/appinfo/info.xml @@ -12,7 +12,7 @@ <category>tools</category> <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs> <dependencies> - <nextcloud min-version="14" max-version="18"/> + <nextcloud min-version="14" max-version="19"/> </dependencies> <navigations> <navigation> diff --git a/ncp-previewgenerator/appinfo/info.xml b/ncp-previewgenerator/appinfo/info.xml index aa3814bb..c499dc31 100644 --- a/ncp-previewgenerator/appinfo/info.xml +++ b/ncp-previewgenerator/appinfo/info.xml @@ -24,7 +24,7 @@ The first time you activate this app through 'nc-previews-auto', you properly wa </types> <dependencies> <php min-version="7.0"/> - <nextcloud min-version="14" max-version="18" /> + <nextcloud min-version="14" max-version="19" /> </dependencies> <commands> diff --git a/updates/1.30.0.sh b/updates/1.30.0.sh new file mode 100644 index 00000000..b958c3ba --- /dev/null +++ b/updates/1.30.0.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +## BACKWARD FIXES ( for older images ) + +source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE + +# all images + +# make sure these are installed as well in all upgrade paths +apt_install php${PHPVER}-gmp haveged lsb-release php-smbclient exfat-fuse exfat-utils file + +# for NC19.0.1 +apt_install php-bcmath + +## delayed in bg so it does not kill the connection, and we get AJAX response +bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null & + + +# docker images only +[[ -f /.docker-image ]] && { + : +} + +# for non docker images +[[ ! -f /.docker-image ]] && { + : +} + +exit 0 |