summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-02-17 22:51:49 -0600
committerZach van Rijn <me@zv.io>2023-04-12 03:25:27 +0000
commitf61f55116a4e330ebf108cbca934be02a06d6873 (patch)
tree0ff1a53d1ff62fc0a4d9a1acfbdc36c167c0b4fa
parentb6e783ee53ed16b99c4c9ad257e04b459a046eb7 (diff)
downloadpackages-f61f55116a4e330ebf108cbca934be02a06d6873.tar.gz
packages-f61f55116a4e330ebf108cbca934be02a06d6873.tar.bz2
packages-f61f55116a4e330ebf108cbca934be02a06d6873.tar.xz
packages-f61f55116a4e330ebf108cbca934be02a06d6873.zip
user/nextcloud: make skipping major versions a hard error
-rw-r--r--user/nextcloud/APKBUILD4
-rw-r--r--user/nextcloud/nextcloud-initscript.post-install2
-rw-r--r--user/nextcloud/nextcloud.pre-upgrade (renamed from user/nextcloud/nextcloud.post-upgrade)4
3 files changed, 5 insertions, 5 deletions
diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD
index 6e948b1ff..39c53fe86 100644
--- a/user/nextcloud/APKBUILD
+++ b/user/nextcloud/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=nextcloud
pkgver=14.0.13
-pkgrel=0
+pkgrel=1
pkgdesc="Self-hosted file sync and groupware server"
url="https://nextcloud.com"
arch="noarch"
@@ -42,7 +42,7 @@ provides="
$pkgname-provisioning_api=$pkgver-r$pkgrel
$pkgname-support=$pkgver-r$pkgrel
"
-install="$pkgname.pre-install $pkgname.post-upgrade
+install="$pkgname.pre-install $pkgname.pre-upgrade
$pkgname-initscript.post-install"
pkgusers="nextcloud"
pkggroups="www-data"
diff --git a/user/nextcloud/nextcloud-initscript.post-install b/user/nextcloud/nextcloud-initscript.post-install
index 6b7fdf671..c90d4de68 100644
--- a/user/nextcloud/nextcloud-initscript.post-install
+++ b/user/nextcloud/nextcloud-initscript.post-install
@@ -17,7 +17,7 @@ cat <<"EOF"
*
* Point your web server to /run/nextcloud/fastcgi.sock and start
* Nextcloud with `service nextcloud start`. You can modify php-fpm
-* settings in /etc/php7/fpm.d/nextcloud.conf.
+* settings in /etc/php/php-fpm.d/nextcloud.conf.
*
EOF
diff --git a/user/nextcloud/nextcloud.post-upgrade b/user/nextcloud/nextcloud.pre-upgrade
index 8c48296ad..2c700e8e7 100644
--- a/user/nextcloud/nextcloud.post-upgrade
+++ b/user/nextcloud/nextcloud.pre-upgrade
@@ -45,11 +45,11 @@ if [ "$maj_diff" -gt 1 ]; then
maj_old="$((maj_old + 1))"
done
cat >&2 <<-EOF
- * apk add nextcloud
+ * apk add -ul nextcloud
* occ upgrade
*
EOF
- exit 0
+ exit 1
fi
if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then