[arch-commits] Commit in nextcloud/trunk (PKGBUILD nextcloud.occ.sh nextcloud.uwsgi)
David Runge
dvzrv at archlinux.org
Wed Mar 3 16:47:42 UTC 2021
Date: Wednesday, March 3, 2021 @ 16:47:42
Author: dvzrv
Revision: 879308
upgpkg: nextcloud 21.0.0-9: Rebuild to fix id check in occ wrapper.
Fix a typo in the occ wrapper: https://bugs.archlinux.org/task/69863.
Remove php-ldap from optdepends (php provides it).
Add curl to optdepends, as it is required for cron jobs from within uwsgi.
Improve uwsgi configuration by
* setting the default socket dir to the apps runtime dir
* fixing the open_basedir by including the correct directory for the logs
* add all php extensions, that are required by default and are covered by depends
* comment all php modules, that are installed via optdepends by default
* comment the cron job and the stats socket by default as they are not required
Modified:
nextcloud/trunk/PKGBUILD
nextcloud/trunk/nextcloud.occ.sh
nextcloud/trunk/nextcloud.uwsgi
------------------+
PKGBUILD | 12 ++++++------
nextcloud.occ.sh | 2 +-
nextcloud.uwsgi | 39 +++++++++++++++++++++++++++------------
3 files changed, 34 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-03 16:40:18 UTC (rev 879307)
+++ PKGBUILD 2021-03-03 16:47:42 UTC (rev 879308)
@@ -4,7 +4,7 @@
pkgname=nextcloud
# NOTE: do not package x.0.0 versions as they are considered beta
pkgver=21.0.0
-pkgrel=8
+pkgrel=9
pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
arch=('any')
url="https://nextcloud.com"
@@ -11,6 +11,7 @@
license=('AGPL3')
depends=('php>=8.0.0' 'php<8.1.0' 'php-gd')
optdepends=(
+ 'curl: for cron jobs from within uwsgi'
'ffmpeg: for preview generation'
'mariadb: to use a local MariaDB server'
'memcached: to use a local memcached server'
@@ -20,7 +21,6 @@
'php-imagick: for preview generation'
'php-imap: for external user authentication'
'php-intl: to increase language translation performance and fix sorting'
- 'php-ldap: for LDAP authentication'
'php-memcached: for caching with memcached'
'php-pgsql: to use the PostgreSQL database backend'
'php-redis: for caching with redis'
@@ -54,19 +54,19 @@
'6f9f284d78d414a3bb7c159a812b105e31e8cd2393afee44465701e6f18169709f6d492d790e403e1e66f308c51b6b6496d29ddce29e4fac2c73a3c84a10c7fe'
'92592f9a76ee534d0ae6d3aedf2257c147337debe7e2d6dbec1daff66a682e3abc74611e08662058de314bf3ea6ff1c85efd678674b782d71251c38786e446f9'
'7b18b73ee369607b8ee3d00d2a054262a7b8f3033fc4873eb333c9b9333d7338870c035910ae123b564a65d7d245730178137311048f0713d5bc524de3654923'
- '207a8679f688519f0da459a11f3a6d5a0b1a4a61f55cd7267429dd786010c6cef198200675f2ca1c171263e2e1f3948bea0cf183150c8c5fec78317a3bf9c558'
+ '1340a9f3479ac83248242547ce948552334ed81097f18fb20c4e9cc3aaafe1575790024bf73399babec8c91858ea0ed4898def4111c4c4585a48e28d8b63e2f3'
'1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84'
'e9cc3e29358720ff6514dff4670c7e61462fc01b6150bf668e6b3084ffaf57f618c68ab718f2277edf484aa6357ce5bbd4eb78c83f3f4561d99e9243b337f6c8'
- 'a3ebcabcdb8c2d2653f44a248abd213bc4dbb317766b82c8f3e93b31e72ace350d7e8037bd4e22a632ab33f739e1941467b0e9d2cf7d0a7433227b4169030051')
+ '234dfd58717a59c7df78c0f7db61e441fd9a56529f147c19d062b30f18218d230882f5a059339d13f7610e5a5f4213d9d66d9d7ddd3d0ac00cacf4fa4d85101c')
b2sums=('7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550'
'SKIP'
'a7e1aa1d8cb2b0ff7832bb7d6d857987733253317c0f3727e744502aeaa3b2008351b47ecc24e348fe7b252cefaffe2418797523ee288dfd55e128917e8fbe2c'
'4ad061efbc20b4d0e9f8cfd01c5e8e612fa5af29bce754b77f90c1835b98ee445ef4de3d8c83da91461053622620af14d880eb9014b51f2383c75f1860d479f4'
'772a9571fe7d88dbcbeb46351a188354e237dfe8e020131f2752b3a36cff0ff177423b4cfd6a1a5f28946f86a8581f3e24ee06ebda7260c5f862ca4071908e43'
- 'fe62bdb93fa94424938147f1f04bd902df02318bf7dffe6076be3d9858cae4b5a9e0336dd72a2151cbf7917675e253f00751b9ce488a9f602da9f7656bb99852'
+ '7644165e2218cde22e44ed5f2e65362b847aa37866b00406761a859506a6d5c97ecf8b59c437f16b82927158a7a74f77ff4f87e7c6f96e4d86b5af91dfd9736c'
'1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db'
'913ce3c91de88c991ec79fe237eb40c13a7e9babd4463694b5f6c25ff47f6a133d48f5cd25a38d4fcb425a822ff5541db9cd4c0f545b3f4726272599278fa95f'
- 'd3c66e22c3cc1b8de1c0b60cd32701080d599dc9853af41d9d9d493ffe3a8d9a2573455d80dd0de019dfe9992187cb23b9df90c18f0ca5962912566014c6779c')
+ '21b4ca4e7d4191eef136f3f805533f0ec6ad16db0b9cd0c92d0a800e5bf7043d82ce4f9c8c563b5c952c366989e5dd56e138bebc8cc02db13b8d713c7d9d30a3')
validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <security at nextcloud.com>
prepare() {
Modified: nextcloud.occ.sh
===================================================================
--- nextcloud.occ.sh 2021-03-03 16:40:18 UTC (rev 879307)
+++ nextcloud.occ.sh 2021-03-03 16:47:42 UTC (rev 879308)
@@ -32,7 +32,7 @@
fi
# allow overriding the user to run as
-if [[ -n "${NEXTCLOUD_USER}" ]] && uid "${NEXTCLOUD_USER}" > /dev/null 2>&1; then
+if [[ -n "${NEXTCLOUD_USER}" ]] && id "${NEXTCLOUD_USER}" > /dev/null 2>&1; then
user="${NEXTCLOUD_USER}"
else
user="${default_user}"
Modified: nextcloud.uwsgi
===================================================================
--- nextcloud.uwsgi 2021-03-03 16:40:18 UTC (rev 879307)
+++ nextcloud.uwsgi 2021-03-03 16:47:42 UTC (rev 879308)
@@ -2,8 +2,9 @@
procname-master = %n
plugins = php
master = true
-socket = /run/uwsgi/%n.sock
-stats = /run/uwsgi/%n-stats.sock
+socket = /run/%n/%n.sock
+# uncomment for a stats socket, that can be used with uwsgitop
+# stats = /run/%n/%n-stats.sock
uid = nextcloud
gid = nextcloud
processes = 10
@@ -23,7 +24,7 @@
php-docroot = /usr/share/webapps/%n
php-index = index.php
php-set = date.timezone=Europe/Berlin
-php-set = open_basedir=%(cloud_data_dir):%(cloud_writable_apps_dir):/tmp/:/usr/share/webapps/%n:/etc/webapps/%n:/dev/urandom:/usr/lib/php/modules:/run/redis/redis.sock:/var/log/%n.log:/proc/meminfo
+php-set = open_basedir=%(cloud_data_dir):%(cloud_writable_apps_dir):/tmp/:/usr/share/webapps/%n:/etc/webapps/%n:/dev/urandom:/usr/lib/php/modules:/run/redis/redis.sock:/var/log/%n/%n.log:/proc/meminfo
php-set = session.save_path=/tmp
php-set = session.gc_maxlifetime 21600
php-set = session.gc_divisor 500
@@ -43,23 +44,37 @@
php-set = opcache.save_comments=1
php-set = opcache.revalidate_freq=1
-php-set = extension=intl
-php-set = extension=apcu
+# uncomment if php-apcu is installed and used
+# php-set = extension=apcu
php-set = extension=bcmath
php-set = extension=bz2
php-set = extension=curl
php-set = extension=exif
+php-set = extension=ftp
php-set = extension=gd
-php-set = extension=imagick
php-set = extension=gmp
+# uncomment if php-imagick is installed and used
+# php-set = extension=imagick
+# uncomment if php-imap is installed and used
+# php-set = extension=imap
+# uncomment if php-intl is installed and used
+# php-set = extension=intl
php-set = extension=iconv
+php-set = extension=ldap
+# uncomment if php-memcached is installed and used
+# php-set = extension=memcached
php-set = extension=pdo_mysql
-php-set = extension=igbinary
-php-set = extension=redis
+# uncomment if php-pgsql is installed and used
+# php-set = extension=pdo_pgsql
+php-set = extension=pdo_sqlite
+# uncomment if php-igbinary is installed and used
+# php-set = extension=igbinary
+# uncomment if php-redis is installed and used (requires php-igbinary)
+# php-set = extension=redis
php-set = extension=sockets
-php-set = extension=xmlrpc
-php-set = extension=xsl
+# uncomment if php-xsl is installed and used
+# php-set = extension=xsl
php-set = extension=zip
-# change the URL to your own address to run a cron job every five minutes
-cron = -5 -1 -1 -1 -1 curl --silent https://change.me.tld/cron.php 1>/dev/null
+# change the URL to your own address and uncomment to run a cron job every five minutes
+# cron = -5 -1 -1 -1 -1 curl --silent https://change.me.tld/cron.php 1>/dev/null
More information about the arch-commits
mailing list