[arch-commits] Commit in nextcloud/repos/community-any (18 files)
David Runge
dvzrv at archlinux.org
Fri Apr 9 09:13:14 UTC 2021
Date: Friday, April 9, 2021 @ 09:13:13
Author: dvzrv
Revision: 915108
archrelease: copy trunk to community-any
Added:
nextcloud/repos/community-any/PKGBUILD
(from rev 915107, nextcloud/trunk/PKGBUILD)
nextcloud/repos/community-any/apache.example.conf
(from rev 915107, nextcloud/trunk/apache.example.conf)
nextcloud/repos/community-any/nextcloud.config.php
(from rev 915107, nextcloud/trunk/nextcloud.config.php)
nextcloud/repos/community-any/nextcloud.hook
(from rev 915107, nextcloud/trunk/nextcloud.hook)
nextcloud/repos/community-any/nextcloud.install
(from rev 915107, nextcloud/trunk/nextcloud.install)
nextcloud/repos/community-any/nextcloud.occ.sh
(from rev 915107, nextcloud/trunk/nextcloud.occ.sh)
nextcloud/repos/community-any/nextcloud.sysusers
(from rev 915107, nextcloud/trunk/nextcloud.sysusers)
nextcloud/repos/community-any/nextcloud.tmpfiles
(from rev 915107, nextcloud/trunk/nextcloud.tmpfiles)
nextcloud/repos/community-any/nextcloud.uwsgi
(from rev 915107, nextcloud/trunk/nextcloud.uwsgi)
Deleted:
nextcloud/repos/community-any/PKGBUILD
nextcloud/repos/community-any/apache.example.conf
nextcloud/repos/community-any/nextcloud.config.php
nextcloud/repos/community-any/nextcloud.hook
nextcloud/repos/community-any/nextcloud.install
nextcloud/repos/community-any/nextcloud.occ.sh
nextcloud/repos/community-any/nextcloud.sysusers
nextcloud/repos/community-any/nextcloud.tmpfiles
nextcloud/repos/community-any/nextcloud.uwsgi
----------------------+
PKGBUILD | 226 ++++++++++++++++++++++++-------------------------
apache.example.conf | 34 +++----
nextcloud.config.php | 34 +++----
nextcloud.hook | 26 ++---
nextcloud.install | 26 ++---
nextcloud.occ.sh | 86 +++++++++---------
nextcloud.sysusers | 2
nextcloud.tmpfiles | 17 +--
nextcloud.uwsgi | 160 +++++++++++++++++-----------------
9 files changed, 307 insertions(+), 304 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-09 09:12:52 UTC (rev 915107)
+++ PKGBUILD 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,113 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=nextcloud
-# NOTE: do not package x.0.0 versions as they are considered beta
-pkgver=21.0.0
-pkgrel=9
-pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
-arch=('any')
-url="https://nextcloud.com"
-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'
- 'php-apcu: for caching with APCU'
- 'php-apache: to use the Apache web server'
- 'php-fpm: to run in fastCGI process manager'
- 'php-imagick: for preview generation'
- 'php-imap: for external user authentication'
- 'php-intl: to increase language translation performance and fix sorting'
- 'php-memcached: for caching with memcached'
- 'php-pgsql: to use the PostgreSQL database backend'
- 'php-redis: for caching with redis'
- 'php-sqlite: to use the SQLite database backend'
- 'postgresql: to use a local PostgreSQL server'
- 'redis: to use a local Redis server'
- 'smbclient: for SMB/CIFS integration'
- 'sudo: for occ command'
- 'libreoffice: for preview generation'
- 'uwsgi-plugin-php: run as application container'
-)
-backup=(
- "etc/webapps/${pkgname}/config/config.php"
- "etc/uwsgi/${pkgname}.ini"
-)
-# there are no elf files, no need to strip anything
-options=(!strip)
-install="${pkgname}.install"
-source=(
- "https://download.nextcloud.com/server/releases/nextcloud-${pkgver}.tar.bz2"{,.asc}
- 'apache.example.conf'
- "${pkgname}.config.php"
- "${pkgname}.hook"
- "${pkgname}.occ.sh"
- "${pkgname}.sysusers"
- "${pkgname}.tmpfiles"
- "${pkgname}.uwsgi"
-)
-sha512sums=('a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a'
- 'SKIP'
- '6f9f284d78d414a3bb7c159a812b105e31e8cd2393afee44465701e6f18169709f6d492d790e403e1e66f308c51b6b6496d29ddce29e4fac2c73a3c84a10c7fe'
- '92592f9a76ee534d0ae6d3aedf2257c147337debe7e2d6dbec1daff66a682e3abc74611e08662058de314bf3ea6ff1c85efd678674b782d71251c38786e446f9'
- '7b18b73ee369607b8ee3d00d2a054262a7b8f3033fc4873eb333c9b9333d7338870c035910ae123b564a65d7d245730178137311048f0713d5bc524de3654923'
- '1340a9f3479ac83248242547ce948552334ed81097f18fb20c4e9cc3aaafe1575790024bf73399babec8c91858ea0ed4898def4111c4c4585a48e28d8b63e2f3'
- '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84'
- 'e9cc3e29358720ff6514dff4670c7e61462fc01b6150bf668e6b3084ffaf57f618c68ab718f2277edf484aa6357ce5bbd4eb78c83f3f4561d99e9243b337f6c8'
- '234dfd58717a59c7df78c0f7db61e441fd9a56529f147c19d062b30f18218d230882f5a059339d13f7610e5a5f4213d9d66d9d7ddd3d0ac00cacf4fa4d85101c')
-b2sums=('7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550'
- 'SKIP'
- 'a7e1aa1d8cb2b0ff7832bb7d6d857987733253317c0f3727e744502aeaa3b2008351b47ecc24e348fe7b252cefaffe2418797523ee288dfd55e128917e8fbe2c'
- '4ad061efbc20b4d0e9f8cfd01c5e8e612fa5af29bce754b77f90c1835b98ee445ef4de3d8c83da91461053622620af14d880eb9014b51f2383c75f1860d479f4'
- '772a9571fe7d88dbcbeb46351a188354e237dfe8e020131f2752b3a36cff0ff177423b4cfd6a1a5f28946f86a8581f3e24ee06ebda7260c5f862ca4071908e43'
- '7644165e2218cde22e44ed5f2e65362b847aa37866b00406761a859506a6d5c97ecf8b59c437f16b82927158a7a74f77ff4f87e7c6f96e4d86b5af91dfd9736c'
- '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db'
- '913ce3c91de88c991ec79fe237eb40c13a7e9babd4463694b5f6c25ff47f6a133d48f5cd25a38d4fcb425a822ff5541db9cd4c0f545b3f4726272599278fa95f'
- '21b4ca4e7d4191eef136f3f805533f0ec6ad16db0b9cd0c92d0a800e5bf7043d82ce4f9c8c563b5c952c366989e5dd56e138bebc8cc02db13b8d713c7d9d30a3')
-validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <security at nextcloud.com>
-
-prepare() {
- mv -v "${pkgname}" "${pkgname}-${pkgver}"
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- # sysusers.d integration
- install -vDm 644 ../${pkgname}.sysusers \
- "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
- # tmpfiles.d integration
- install -vDm 644 ../${pkgname}.tmpfiles \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
- # state dir for data and writable apps
- install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"
- install -vdm 770 "${pkgdir}/var/lib/${pkgname}/data"
- install -vdm 755 "${pkgdir}/var/lib/${pkgname}/apps"
- # log dir
- install -vdm 755 "${pkgdir}/var/log/${pkgname}/"
- # uwsgi integration
- install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini"
- # config dir
- install -vDm 640 "../${pkgname}.config.php" "${pkgdir}/etc/webapps/${pkgname}/config/config.php"
- find config -type f -exec install -vDm 644 {} "${pkgdir}/etc/webapps/${pkgname}/"{} \;
- # remove config dir from source so that it is not installed to default location
- rm -rf config
-
- # webapp
- find . -type f -exec install -vDm 644 {} "${pkgdir}/usr/share/webapps/${pkgname}/"{} \;
-
- # symlink config directory into place
- ln -sv "/etc/webapps/${pkgname}/config" "${pkgdir}/usr/share/webapps/${pkgname}/"
- # add symlink to default writable apps directory
- ln -sv "/var/lib/${pkgname}/apps" "${pkgdir}/usr/share/webapps/${pkgname}/wapps"
- # install occ command
- install -vDm 755 occ -t "${pkgdir}/usr/share/webapps/${pkgname}"
- # occ script
- install -vDm 755 "../${pkgname}.occ.sh" "${pkgdir}/usr/bin/occ"
- # optional pacman hook
- install -vDm 644 "../${pkgname}.hook" -t "${pkgdir}/usr/share/doc/${pkgname}/"
- # apache example conf
- install -vDm 644 ../apache.example.conf -t "${pkgdir}/usr/share/doc/${pkgname}/"
-}
Copied: nextcloud/repos/community-any/PKGBUILD (from rev 915107, nextcloud/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,113 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=nextcloud
+# NOTE: do not package x.0.0 versions as they are considered beta
+pkgver=21.0.1
+pkgrel=1
+pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
+arch=('any')
+url="https://nextcloud.com"
+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'
+ 'libreoffice: for preview generation'
+ 'mariadb: to use a local MariaDB server'
+ 'memcached: to use a local memcached server'
+ 'php-apcu: for caching with APCU'
+ 'php-apache: to use the Apache web server'
+ 'php-fpm: to run in fastCGI process manager'
+ 'php-imagick: for preview generation'
+ 'php-imap: for external user authentication'
+ 'php-intl: to increase language translation performance and fix sorting'
+ 'php-memcached: for caching with memcached'
+ 'php-pgsql: to use the PostgreSQL database backend'
+ 'php-redis: for caching with redis'
+ 'php-sqlite: to use the SQLite database backend'
+ 'postgresql: to use a local PostgreSQL server'
+ 'redis: to use a local Redis server'
+ 'smbclient: for SMB/CIFS integration'
+ 'sudo: for privilege elevation in occ command when not run as root'
+ 'uwsgi-plugin-php: run as application container'
+)
+backup=(
+ "etc/webapps/${pkgname}/config/config.php"
+ "etc/uwsgi/${pkgname}.ini"
+)
+# there are no elf files, no need to strip anything
+options=(!strip)
+install="${pkgname}.install"
+source=(
+ "https://download.nextcloud.com/server/releases/nextcloud-${pkgver}.tar.bz2"{,.asc}
+ 'apache.example.conf'
+ "${pkgname}.config.php"
+ "${pkgname}.hook"
+ "${pkgname}.occ.sh"
+ "${pkgname}.sysusers"
+ "${pkgname}.tmpfiles"
+ "${pkgname}.uwsgi"
+)
+sha512sums=('a1339515349af45d293985e939235cf7a6723f0b65144c0635c66bc8110caa13a7e10672550aeb9aa46a61b93b28240cdb76696e41ccae76b8bed6d8667d3c51'
+ 'SKIP'
+ '6f9f284d78d414a3bb7c159a812b105e31e8cd2393afee44465701e6f18169709f6d492d790e403e1e66f308c51b6b6496d29ddce29e4fac2c73a3c84a10c7fe'
+ '92592f9a76ee534d0ae6d3aedf2257c147337debe7e2d6dbec1daff66a682e3abc74611e08662058de314bf3ea6ff1c85efd678674b782d71251c38786e446f9'
+ '7b18b73ee369607b8ee3d00d2a054262a7b8f3033fc4873eb333c9b9333d7338870c035910ae123b564a65d7d245730178137311048f0713d5bc524de3654923'
+ 'daae0331998fc3b135c18330cd8f8405958abce1a913cdbc16accc3c49f2b185a6d44cf4d768eb1eb11d1dd1d81dcc3fe75ec959bd9f4c9c5eb85c450d5ad408'
+ '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84'
+ '78d6b36a9e32727adc7d40de1c4306d815c6d67b32a452bae9e916f65d83997a9a695fb2957a323978fc4909f71c03c9d49059b4e43ee41e572da8a7c3866dec'
+ '70c173e12c1fcd7ea54463c606516275adcb7e113a5fc97e0364972c742bbdd711c8fb97c236e9194e2cbe228129425aa146265a741966c2f0abedf79d3cf25a')
+b2sums=('75483871d83b5513ccdd8b4e142c63ac2efbe651df15a2a3631ccfdc0865d5a78f0aca2205359fe329ea28a550a6bdcfd05c45f2d059bca98ebca52f8d7d6c88'
+ 'SKIP'
+ 'a7e1aa1d8cb2b0ff7832bb7d6d857987733253317c0f3727e744502aeaa3b2008351b47ecc24e348fe7b252cefaffe2418797523ee288dfd55e128917e8fbe2c'
+ '4ad061efbc20b4d0e9f8cfd01c5e8e612fa5af29bce754b77f90c1835b98ee445ef4de3d8c83da91461053622620af14d880eb9014b51f2383c75f1860d479f4'
+ '772a9571fe7d88dbcbeb46351a188354e237dfe8e020131f2752b3a36cff0ff177423b4cfd6a1a5f28946f86a8581f3e24ee06ebda7260c5f862ca4071908e43'
+ '150273823fdadcaecf3e2af036067581cb4cf02507c6da2a533ef3c288a2a715d076f83c6d6d4ff13cd336184f595361318faa2acdc68979edfad7afef0b575b'
+ '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db'
+ '65ddc58d074f08d1169e60db4082b3cf40bc95eb98711bca8f3e5b2e6d037dc60934f888e6efbcbf00274521510e6ab8309249400817fac5f8d628ea54c52958'
+ 'e578d24006f87194e92a20738cb51cbcf8d2515e83fe5a603298f0a82032446b227de74c484899271b2c0b3028f010b2d7d4169f2704ddf5cd2548587a6e09f1')
+validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <security at nextcloud.com>
+
+prepare() {
+ mv -v "${pkgname}" "${pkgname}-${pkgver}"
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ # sysusers.d integration
+ install -vDm 644 ../${pkgname}.sysusers \
+ "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+ # tmpfiles.d integration
+ install -vDm 644 ../${pkgname}.tmpfiles \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+ # state dir for data and writable apps
+ install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"
+ install -vdm 770 "${pkgdir}/var/lib/${pkgname}/data"
+ install -vdm 755 "${pkgdir}/var/lib/${pkgname}/apps"
+ # log dir
+ install -vdm 755 "${pkgdir}/var/log/${pkgname}/"
+ # uwsgi integration
+ install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini"
+ # config dir
+ install -vDm 640 "../${pkgname}.config.php" "${pkgdir}/etc/webapps/${pkgname}/config/config.php"
+ find config -type f -exec install -vDm 644 {} "${pkgdir}/etc/webapps/${pkgname}/"{} \;
+ # remove config dir from source so that it is not installed to default location
+ rm -rf config
+
+ # webapp
+ find . -type f -exec install -vDm 644 {} "${pkgdir}/usr/share/webapps/${pkgname}/"{} \;
+
+ # symlink config directory into place
+ ln -sv "/etc/webapps/${pkgname}/config" "${pkgdir}/usr/share/webapps/${pkgname}/"
+ # add symlink to default writable apps directory
+ ln -sv "/var/lib/${pkgname}/apps" "${pkgdir}/usr/share/webapps/${pkgname}/wapps"
+ # install occ command
+ install -vDm 755 occ -t "${pkgdir}/usr/share/webapps/${pkgname}"
+ # occ script
+ install -vDm 755 "../${pkgname}.occ.sh" "${pkgdir}/usr/bin/occ"
+ # optional pacman hook
+ install -vDm 644 "../${pkgname}.hook" -t "${pkgdir}/usr/share/doc/${pkgname}/"
+ # apache example conf
+ install -vDm 644 ../apache.example.conf -t "${pkgdir}/usr/share/doc/${pkgname}/"
+}
Deleted: apache.example.conf
===================================================================
--- apache.example.conf 2021-04-09 09:12:52 UTC (rev 915107)
+++ apache.example.conf 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,17 +0,0 @@
-<IfModule mod_alias.c>
- Alias /nextcloud /usr/share/webapps/nextcloud/
-</IfModule>
-
-<Directory /usr/share/webapps/nextcloud/>
- Options FollowSymlinks
- AllowOverride all
- Require all granted
-</Directory>
-
-<VirtualHost *:80>
- ServerAdmin foo at foofarm.com
- DocumentRoot /usr/share/webapps/nextcloud
- ServerName nextcloud.foo.com
- ErrorLog /var/log/httpd/nextcloud.foo.info-error_log
- CustomLog /var/log/httpd/nextcloud.foo.info-access_log common
-</VirtualHost>
Copied: nextcloud/repos/community-any/apache.example.conf (from rev 915107, nextcloud/trunk/apache.example.conf)
===================================================================
--- apache.example.conf (rev 0)
+++ apache.example.conf 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,17 @@
+<IfModule mod_alias.c>
+ Alias /nextcloud /usr/share/webapps/nextcloud/
+</IfModule>
+
+<Directory /usr/share/webapps/nextcloud/>
+ Options FollowSymlinks
+ AllowOverride all
+ Require all granted
+</Directory>
+
+<VirtualHost *:80>
+ ServerAdmin foo at foofarm.com
+ DocumentRoot /usr/share/webapps/nextcloud
+ ServerName nextcloud.foo.com
+ ErrorLog /var/log/httpd/nextcloud.foo.info-error_log
+ CustomLog /var/log/httpd/nextcloud.foo.info-access_log common
+</VirtualHost>
Deleted: nextcloud.config.php
===================================================================
--- nextcloud.config.php 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.config.php 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,17 +0,0 @@
-<?php
-$CONFIG = array (
-'datadirectory' => '/var/lib/nextcloud/data',
-'logfile' => '/var/log/nextcloud/nextcloud.log',
-'apps_paths' => [
- [
- 'path'=> '/usr/share/webapps/nextcloud/apps',
- 'url' => '/apps',
- 'writable' => false,
- ],
- [
- 'path'=> '/var/lib/nextcloud/apps',
- 'url' => '/wapps',
- 'writable' => true,
- ],
-],
-);
Copied: nextcloud/repos/community-any/nextcloud.config.php (from rev 915107, nextcloud/trunk/nextcloud.config.php)
===================================================================
--- nextcloud.config.php (rev 0)
+++ nextcloud.config.php 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,17 @@
+<?php
+$CONFIG = array (
+'datadirectory' => '/var/lib/nextcloud/data',
+'logfile' => '/var/log/nextcloud/nextcloud.log',
+'apps_paths' => [
+ [
+ 'path'=> '/usr/share/webapps/nextcloud/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ],
+ [
+ 'path'=> '/var/lib/nextcloud/apps',
+ 'url' => '/wapps',
+ 'writable' => true,
+ ],
+],
+);
Deleted: nextcloud.hook
===================================================================
--- nextcloud.hook 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.hook 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,13 +0,0 @@
-# Update Nextcloud when core or -apps are touched
-
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = Package
-Target = nextcloud
-Target = nextcloud-app-*
-
-[Action]
-Description = Updating Nextcloud installation
-When = PostTransaction
-Exec = /usr/bin/runuser -u nextcloud -- /usr/bin/php /usr/share/webapps/nextcloud/occ upgrade
Copied: nextcloud/repos/community-any/nextcloud.hook (from rev 915107, nextcloud/trunk/nextcloud.hook)
===================================================================
--- nextcloud.hook (rev 0)
+++ nextcloud.hook 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,13 @@
+# Update Nextcloud when core or -apps are touched
+
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = nextcloud
+Target = nextcloud-app-*
+
+[Action]
+Description = Updating Nextcloud installation
+When = PostTransaction
+Exec = /usr/bin/runuser -u nextcloud -- /usr/bin/php /usr/share/webapps/nextcloud/occ upgrade
Deleted: nextcloud.install
===================================================================
--- nextcloud.install 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.install 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,13 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if [ "$(vercmp "$2" 21.0.0)" -le 0 ]; then
- printf "WARNING: Major changes introduced to package!\n"
- printf " The application is now run as its own user - nextcloud.\n"
- printf " Default directories for runtime, state and log files are provided.\n"
- printf " A convenience wrapper around occ is provided in /usr/bin/occ.\n"
- fi
- # directories below /usr/share/webapps/nextcloud are still group-owned by the
- # nextcloud user due to nextcloud < 21.0.0
- find /usr/share/webapps/nextcloud -type d -exec chgrp root {} \;
-}
Copied: nextcloud/repos/community-any/nextcloud.install (from rev 915107, nextcloud/trunk/nextcloud.install)
===================================================================
--- nextcloud.install (rev 0)
+++ nextcloud.install 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,13 @@
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp "$2" '21.0.0-6')" -lt 0 ]; then
+ printf "WARNING: Major changes introduced to package!\n"
+ printf " The application is now run as its own user - nextcloud.\n"
+ printf " Default directories for runtime, state and log files are provided.\n"
+ printf " A convenience wrapper around occ is provided in /usr/bin/occ.\n"
+ # directories below /usr/share/webapps/nextcloud are still group-owned by the
+ # nextcloud user due to nextcloud < 21.0.0
+ find /usr/share/webapps/nextcloud -type d -exec chgrp root {} \;
+ fi
+}
Deleted: nextcloud.occ.sh
===================================================================
--- nextcloud.occ.sh 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.occ.sh 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-readonly default_config="/etc/php/php.ini"
-readonly default_php_command="/usr/bin/php"
-readonly default_user="nextcloud"
-
-config=""
-php_command=""
-user=""
-
-check_sudo() {
- if ! command -v sudo > /dev/null; then
- printf "The sudo command is not available.\n"
- exit 1
- fi
-}
-
-check_sudo
-
-# allow overriding the php.ini
-if [[ -n "${NEXTCLOUD_PHP_CONFIG}" ]] && [[ -f "${NEXTCLOUD_PHP_CONFIG}" ]]; then
- config="${NEXTCLOUD_PHP_CONFIG}"
-else
- config="${default_config}"
-fi
-
-# allow overriding the php executable
-if [[ -n "${NEXTCLOUD_PHP}" ]] && command -v "${NEXTCLOUD_PHP}" > /dev/null; then
- php_command="${NEXTCLOUD_PHP}"
-else
- php_command="${default_php_command}"
-fi
-
-# allow overriding the user to run as
-if [[ -n "${NEXTCLOUD_USER}" ]] && id "${NEXTCLOUD_USER}" > /dev/null 2>&1; then
- user="${NEXTCLOUD_USER}"
-else
- user="${default_user}"
-fi
-
-sudo --preserve-env=NEXTCLOUD_CONFIG_DIR -u "$user" "$php_command" -c "${config}" /usr/share/webapps/nextcloud/occ "$@"
Copied: nextcloud/repos/community-any/nextcloud.occ.sh (from rev 915107, nextcloud/trunk/nextcloud.occ.sh)
===================================================================
--- nextcloud.occ.sh (rev 0)
+++ nextcloud.occ.sh 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+readonly default_config="/etc/php/php.ini"
+readonly default_php_command="/usr/bin/php"
+readonly default_user="nextcloud"
+readonly preserved_environment_vars="NEXTCLOUD_CONFIG_DIR"
+
+config=""
+php_command=""
+user=""
+
+check_sudo() {
+ if ! command -v sudo > /dev/null; then
+ printf "The sudo command is not available.\n"
+ exit 1
+ fi
+}
+
+# allow overriding the php.ini
+if [[ -n "${NEXTCLOUD_PHP_CONFIG}" ]] && [[ -f "${NEXTCLOUD_PHP_CONFIG}" ]]; then
+ config="${NEXTCLOUD_PHP_CONFIG}"
+else
+ config="${default_config}"
+fi
+
+# allow overriding the php executable
+if [[ -n "${NEXTCLOUD_PHP}" ]] && command -v "${NEXTCLOUD_PHP}" > /dev/null; then
+ php_command="${NEXTCLOUD_PHP}"
+else
+ php_command="${default_php_command}"
+fi
+
+# allow overriding the user to run as
+if [[ -n "${NEXTCLOUD_USER}" ]] && id "${NEXTCLOUD_USER}" > /dev/null 2>&1; then
+ user="${NEXTCLOUD_USER}"
+else
+ user="${default_user}"
+fi
+
+if [[ "${UID}" -eq 0 ]]; then
+ runuser --whitelist-environment="${preserved_environment_vars}" -u "$user" -- "$php_command" -c "${config}" /usr/share/webapps/nextcloud/occ "$@"
+else
+ check_sudo
+ sudo --preserve-env="${preserved_environment_vars}" -u "$user" "$php_command" -c "${config}" /usr/share/webapps/nextcloud/occ "$@"
+fi
Deleted: nextcloud.sysusers
===================================================================
--- nextcloud.sysusers 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.sysusers 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1 +0,0 @@
-u nextcloud - "Nextcloud user" - -
Copied: nextcloud/repos/community-any/nextcloud.sysusers (from rev 915107, nextcloud/trunk/nextcloud.sysusers)
===================================================================
--- nextcloud.sysusers (rev 0)
+++ nextcloud.sysusers 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1 @@
+u nextcloud - "Nextcloud user" - -
Deleted: nextcloud.tmpfiles
===================================================================
--- nextcloud.tmpfiles 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.tmpfiles 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,9 +0,0 @@
-Z /etc/webapps/nextcloud/config - nextcloud nextcloud
-z /etc/webapps/nextcloud/ 0755 root root
-Z %C/nextcloud - nextcloud nextcloud
-d %t/nextcloud 0755 nextcloud nextcloud
-z %L/nextcloud 0755 nextcloud nextcloud
-Z %S/nextcloud - nextcloud nextcloud
-z %S/nextcloud 0755 nextcloud nextcloud
-z %S/nextcloud/apps 0755 nextcloud nextcloud
-z %S/nextcloud/data 0770 nextcloud nextcloud
Copied: nextcloud/repos/community-any/nextcloud.tmpfiles (from rev 915107, nextcloud/trunk/nextcloud.tmpfiles)
===================================================================
--- nextcloud.tmpfiles (rev 0)
+++ nextcloud.tmpfiles 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,8 @@
+Z /etc/webapps/nextcloud/config - nextcloud nextcloud
+z /etc/webapps/nextcloud/ 0755 root root
+Z %C/nextcloud - nextcloud nextcloud
+d %t/nextcloud 0755 nextcloud nextcloud
+z %L/nextcloud 0755 nextcloud nextcloud
+z %S/nextcloud 0755 nextcloud nextcloud
+z %S/nextcloud/apps 0755 nextcloud nextcloud
+z %S/nextcloud/data 0770 nextcloud nextcloud
Deleted: nextcloud.uwsgi
===================================================================
--- nextcloud.uwsgi 2021-04-09 09:12:52 UTC (rev 915107)
+++ nextcloud.uwsgi 2021-04-09 09:13:13 UTC (rev 915108)
@@ -1,80 +0,0 @@
-[uwsgi]
-procname-master = %n
-plugins = php
-master = true
-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
-cheaper = 4
-cheaper-step = 1
-idle = 600
-die-on-idle = true
-
-; reload whenever this config file changes
-touch-reload = %p
-
-cloud_data_dir = /var/lib/nextcloud/data
-cloud_writable_apps_dir = /var/lib/nextcloud/apps
-chdir = %(cloud_data_dir)
-
-php-allowed-ext = .php
-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/%n.log:/proc/meminfo
-php-set = session.save_path=/tmp
-php-set = session.gc_maxlifetime 21600
-php-set = session.gc_divisor 500
-php-set = session.gc_probability 1
-php-set = post_max_size=1000M
-php-set = upload_max_filesize=1000M
-php-set = always_populate_raw_post_data=-1
-php-set = max_input_time=120
-php-set = max_execution_time=60
-php-set = memory_limit=768M
-php-set = zend_extension=opcache
-php-set = opcache.enable=1
-php-set = opcache.enable_cli=1
-php-set = opcache.interned_strings_buffer=8
-php-set = opcache.max_accelerated_files=10000
-php-set = opcache.memory_consumption=128
-php-set = opcache.save_comments=1
-php-set = opcache.revalidate_freq=1
-
-# 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=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
-# 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
-# uncomment if php-xsl is installed and used
-# php-set = extension=xsl
-php-set = extension=zip
-
-# 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
Copied: nextcloud/repos/community-any/nextcloud.uwsgi (from rev 915107, nextcloud/trunk/nextcloud.uwsgi)
===================================================================
--- nextcloud.uwsgi (rev 0)
+++ nextcloud.uwsgi 2021-04-09 09:13:13 UTC (rev 915108)
@@ -0,0 +1,80 @@
+[uwsgi]
+procname-master = %n
+plugins = php
+master = true
+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
+cheaper = 4
+cheaper-step = 1
+idle = 600
+die-on-idle = true
+
+; reload whenever this config file changes
+touch-reload = %p
+
+cloud_data_dir = /var/lib/nextcloud/data
+cloud_writable_apps_dir = /var/lib/nextcloud/apps
+chdir = %(cloud_data_dir)
+
+php-allowed-ext = .php
+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):/var/lib/%n:/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
+php-set = session.gc_probability 1
+php-set = post_max_size=1000M
+php-set = upload_max_filesize=1000M
+php-set = always_populate_raw_post_data=-1
+php-set = max_input_time=120
+php-set = max_execution_time=60
+php-set = memory_limit=768M
+php-set = zend_extension=opcache
+php-set = opcache.enable=1
+php-set = opcache.enable_cli=1
+php-set = opcache.interned_strings_buffer=8
+php-set = opcache.max_accelerated_files=10000
+php-set = opcache.memory_consumption=128
+php-set = opcache.save_comments=1
+php-set = opcache.revalidate_freq=1
+
+# 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=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
+# 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
+# uncomment if php-xsl is installed and used
+# php-set = extension=xsl
+php-set = extension=zip
+
+# 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