From 880c6fff00f523d38088d26c88c8491debaa9a03 Mon Sep 17 00:00:00 2001 From: MB-Finski <64466176+MB-Finski@users.noreply.github.com> Date: Sun, 2 Oct 2022 22:09:38 +0300 Subject: [PATCH 1/4] Change backup directory for docker compatibility Improve docker compatibility: Change the backup directory for ./nextcloud/data to reside within the host file system (basedir) so as to avoid moving the data folder back and forth between the docker container and the host file system. In situations where the nextcloud data takes up more than the free available space on the host system, this may lead to loosing some or all of the data. Signed-off-by: MB-Finski <64466176+MB-Finski@users.noreply.github.com> --- bin/ncp-update-nc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index 60e8486f0..e3f8417c0 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -165,7 +165,7 @@ rollback() { rm -rf /var/www/nextcloud.tar.bz2 "$BASEDIR"/nextcloud-old echo "Rolling back to backup $BKP..." local TMPDATA - TMPDATA="$( mktemp -d "/var/www/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; } + TMPDATA="$( mktemp -d "$BASEDIR/recovery/ncp-data.XXXXXX" )" || { echo "Failed to create temp dir" >&2; exit 1; } [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && mv -T "$DATADIR" "$TMPDATA" ncp-restore "$BKP" || { echo "Rollback failed! Data left at $TMPDATA"; exit 1; } [[ "$DATADIR" == "$BASEDIR/nextcloud/data" ]] && { rm -rf "$DATADIR"; mv -T "$TMPDATA" "$DATADIR"; } From 04729604ee3319b347d7e358c85f3cf4be3f511e Mon Sep 17 00:00:00 2001 From: coltkondo Date: Mon, 26 Sep 2022 22:11:18 -0400 Subject: [PATCH 2/4] Fixed: Nextcloudpi icon pointing to ownyoursbits.com #1571 --- ncp-web/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ncp-web/index.php b/ncp-web/index.php index e7e3f5390..17045474a 100644 --- a/ncp-web/index.php +++ b/ncp-web/index.php @@ -134,7 +134,7 @@
- "> + ">
@@ -207,7 +207,7 @@
- "> + ">
From 10a7c01b22823e9937299b476e196f5432b22cb0 Mon Sep 17 00:00:00 2001 From: MB-Finski <64466176+MB-Finski@users.noreply.github.com> Date: Sun, 2 Oct 2022 22:46:51 +0300 Subject: [PATCH 3/4] Temporarily place backup to BASEDIR Improves docker compatibility. Placing the backup file in /var/www/ will cause a failure in rolling back the update on containerized setups ("Can only restore from ext/btrfs/zfs filesystems"). The host filesystem is most likely compatible so using $BASEDIR as the backup location *should* solve this issue for most users. Signed-off-by: MB-Finski <64466176+MB-Finski@users.noreply.github.com> --- bin/ncp-update-nc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index 60e8486f0..28fa51825 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -94,7 +94,7 @@ wget -q "$URL" -O nextcloud.tar.bz2 || { echo "Error downloading"; exit 1; } # backup #################### -BKPDIR=/var/www/ +BKPDIR="$BASEDIR" WITH_DATA=no COMPRESSED=yes LIMIT=0 From 288f0a9ea2d4c59426be9d37f800618aa09abf53 Mon Sep 17 00:00:00 2001 From: MB-Finski <64466176+MB-Finski@users.noreply.github.com> Date: Sun, 9 Oct 2022 23:17:26 +0300 Subject: [PATCH 4/4] Fix rm path for update package Fixes a bening bug where the nextcloud update package won't be removed after unpacking when the code is run inside a docker container. Also, for readability/clarity, remove an unnecessary "/var/www" from a cp command. Signed-off-by: MB-Finski <64466176+MB-Finski@users.noreply.github.com> --- bin/ncp-update-nc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index 7d1930276..86e1218ae 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -129,7 +129,7 @@ trap rollback_simple INT TERM HUP ERR echo "Install Nextcloud $VER..." mv -T nextcloud nextcloud-old tar -xf nextcloud.tar.bz2 # && false # test point -rm -rf /var/www/nextcloud.tar.bz2 +rm -rf "$BASEDIR"/nextcloud.tar.bz2 # copy old config #################### @@ -143,7 +143,7 @@ cp -raT nextcloud-old/themes/ nextcloud/themes/ #################### for app in nextcloudpi previewgenerator; do if [[ -d nextcloud-old/apps/"${app}" ]]; then - cp -r -L nextcloud-old/apps/"${app}" /var/www/nextcloud/apps/ + cp -r -L nextcloud-old/apps/"${app}" nextcloud/apps/ fi done