Date: Thursday, May 5, 2022 @ 21:55:07 Author: dvzrv Revision: 1195544
archrelease: copy trunk to community-staging-any Added: nextcloud/repos/community-staging-any/PKGBUILD (from rev 1195543, nextcloud/trunk/PKGBUILD) nextcloud/repos/community-staging-any/apache.example.conf (from rev 1195543, nextcloud/trunk/apache.example.conf) nextcloud/repos/community-staging-any/nextcloud-cron.service (from rev 1195543, nextcloud/trunk/nextcloud-cron.service) nextcloud/repos/community-staging-any/nextcloud-cron.timer (from rev 1195543, nextcloud/trunk/nextcloud-cron.timer) nextcloud/repos/community-staging-any/nextcloud.config.php (from rev 1195543, nextcloud/trunk/nextcloud.config.php) nextcloud/repos/community-staging-any/nextcloud.hook (from rev 1195543, nextcloud/trunk/nextcloud.hook) nextcloud/repos/community-staging-any/nextcloud.install (from rev 1195543, nextcloud/trunk/nextcloud.install) nextcloud/repos/community-staging-any/nextcloud.occ.sh (from rev 1195543, nextcloud/trunk/nextcloud.occ.sh) nextcloud/repos/community-staging-any/nextcloud.sysusers (from rev 1195543, nextcloud/trunk/nextcloud.sysusers) nextcloud/repos/community-staging-any/nextcloud.tmpfiles (from rev 1195543, nextcloud/trunk/nextcloud.tmpfiles) nextcloud/repos/community-staging-any/nextcloud.uwsgi (from rev 1195543, nextcloud/trunk/nextcloud.uwsgi) Deleted: nextcloud/repos/community-staging-any/PKGBUILD nextcloud/repos/community-staging-any/apache.example.conf nextcloud/repos/community-staging-any/nextcloud-cron.service nextcloud/repos/community-staging-any/nextcloud-cron.timer nextcloud/repos/community-staging-any/nextcloud.config.php nextcloud/repos/community-staging-any/nextcloud.hook nextcloud/repos/community-staging-any/nextcloud.install nextcloud/repos/community-staging-any/nextcloud.occ.sh nextcloud/repos/community-staging-any/nextcloud.sysusers nextcloud/repos/community-staging-any/nextcloud.tmpfiles nextcloud/repos/community-staging-any/nextcloud.uwsgi ------------------------+ PKGBUILD | 365 +++++++++++++++++++++++------------------------ apache.example.conf | 42 ++--- nextcloud-cron.service | 12 - nextcloud-cron.timer | 18 +- nextcloud.config.php | 34 ++-- nextcloud.hook | 26 +-- nextcloud.install | 32 ++-- nextcloud.occ.sh | 90 +++++------ nextcloud.sysusers | 2 nextcloud.tmpfiles | 18 +- nextcloud.uwsgi | 164 ++++++++++----------- 11 files changed, 403 insertions(+), 400 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-05 21:54:42 UTC (rev 1195543) +++ PKGBUILD 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,181 +0,0 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: David Runge <dv...@archlinux.org> - -pkgname=nextcloud -# NOTE: always check first whether the version is supposed to be packaged: -# https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule -pkgver=23.0.4 -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>=7.4' 'php<8.1.0' 'php-gd>=7.4' 'php-gd<8.1.0') -optdepends=( - 'curl: for webcron 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' - 'mod_itk: to use the Apache web server' - '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' -) -backup=( - etc/webapps/$pkgname/config/config.php - etc/webapps/$pkgname/.htaccess - 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/$pkgname-$pkgver.tar.bz2{,.asc} - apache.example.conf - $pkgname.config.php - $pkgname.hook - $pkgname.occ.sh - $pkgname.sysusers - $pkgname.tmpfiles - $pkgname.uwsgi - $pkgname-cron.service - $pkgname-cron.timer -) -sha512sums=('f43acf7c9df6e3105d9085bf9b4c95eebca83812980b933cd57920dec5684c34fe47e8f5395aa7eed806c75f13049790a30b2f8abce8738f9e8a55b24280871f' - 'SKIP' - '5f9be223225e6ad2772989c440df8585a852ea0be697274384064ec73df47dab2f5d0847c275732fab26c419a713911d8f77ebc2b639bf6e8ede76272b752cde' - '92592f9a76ee534d0ae6d3aedf2257c147337debe7e2d6dbec1daff66a682e3abc74611e08662058de314bf3ea6ff1c85efd678674b782d71251c38786e446f9' - '2791382d7b005c64cd6938695f273e83435cc5f1b785fe7d44d6dbd69864c502847e45d93c4a5f6752a759a660118279e3e22e5bc32f79b8775693fde603a9c5' - '20f12f0bb1d0ac735fb86e79e90fb99028e06e0d5a6842d449e443b418442682cad2573cfd4bf8e2a802c2aeb5780bce4647d45054bbc38156ae037802358698' - '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84' - '919008a2bf6cf2492cb1e9c8e28c1e082d74e45da5a96e6669f8971d6cf721e36d23625c89918fe10d8bc1b202c0340aa897849d9ec501a26f3f4572ccb57a98' - '67d32011e3dccf41ecaaeffa7486e70b8ee516b3423796c19cc9c95ba6ecd5d031540eeacefb9423fdfc70b1baad15a4885b7147cfbbb2773b349e72d3fe4df2' - '5034d4f78090a7455521fc2e7e391c8eab06b503979c5f14d4144e52c08717e7fc796e0e3048059b1e5802365667c6f87162b5c403cac971e1b77fc1688596f3' - 'eb69785a5b0df0e2a11f53f9c2e2dbf75681d7c698e88cbcc5ceed713a558d528511cc576813cc083cbaa28a2c83d543a39436ad4805670348ef22634305b1c8') -b2sums=('6202ca26c1fd2839cd46651dfb727e20ea8eaab5329aedb905d23817ed3399ce999aff3161f0a6301d558a7acf537b8b54befeabe831e132a56b22bc3c13e635' - 'SKIP' - '7d40d120c28291f1a7537f3e1b5049fa83c9c0af949371345ea9ccdf3de4a0f3a3a06edbc52d9254dba483e4d11acf562cf679b9e379c5dfc2f61dfbfc2e4cef' - '4ad061efbc20b4d0e9f8cfd01c5e8e612fa5af29bce754b77f90c1835b98ee445ef4de3d8c83da91461053622620af14d880eb9014b51f2383c75f1860d479f4' - 'c69f18de513562e32f0f655fee7ef81877d74a76717e2eaad9a13882bf8edd0dad99bec5958e460a4ec32eecfdd425ae009d11ac27af16a3ad1d6498282be32f' - 'f3d1423a457c7a24c25c8b18e24b838b63e99a7f7562ded954ea605c76bbd31e8e79158314e1343e341aa21b6a26dc57ca4f00b871bbc170f6b7d5044985e661' - '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db' - 'd132044cb7f1d61a1ce87800d2e1142e3ac385acdec25e2f5ad685603a0ffa88e105f4c35688584d65d287adbb40b8d9a02d6a80d7a0b58bb8801a6769405218' - '67fa7d9207ab3e8309d4adcce734bd25f82bd03f1f88adea7e40adaddebb345b96a793df7960db79f4f39947f5edff61548bb409066b81e3fe643d313e68d66a' - 'fefaf3238475e991c2dc2bda7cda17019d473e8bbafa9817a31a941552c7362e2e12aad1aa925c45a595ab9f0b645b8d4b4236c86ecf8db87e662a7a05ddfcd5' - 'e6214351ca16bfe97683e838e727d6b5eaa62194878272204034c62aac4a632c9b33cd31aa0570c2eb936d7e9e7ff60190ac05a3a8cc2e27eda423a7d89b6d39') -validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <secur...@nextcloud.com> - -_get_php_versions() { - local _phps=(php7 php) - local _min _max - - _min=$(sed -nr 's/^.*PHP_VERSION_ID < ([0-9]*).*$/\1/p' $pkgname/lib/versioncheck.php) - _max=$(sed -nr 's/^.*PHP_VERSION_ID >= ([0-9]*).*$/\1/p' $pkgname/lib/versioncheck.php) - _min_php="${_min:0:1}.${_min:2:1}" - _max_php="${_max:0:1}.${_max:2:1}" - - _php_interpreter="" - for _php in "${_phps[@]}"; do - if command -v "$_php" > /dev/null; then - if [[ -z "$_php_interpreter" ]]; then - _php_interpreter="$_php" - fi - fi - done - _system_php="$($_php_interpreter --version |head -n1 |cut -d ' ' -f2)" - printf "Detected php interpreter %s\n" $_php_interpreter - printf "Detected php %s\n" $_system_php - printf "%s requires %s >= php < %s\n" $pkgname $_min_php $_max_php -} - -prepare() { - local _file - - _get_php_versions - - # setup files with default PHP interpreter - mkdir -vp custom_files - for _file in nextcloud.{occ.sh,uwsgi} nextcloud-cron.service; do - sed "s/PHP_INTERPRETER/$_php_interpreter/g" $_file > custom_files/$_file - done -} - -check() { - _get_php_versions - if [[ "$(vercmp "$_system_php" "$_min_php" )" -lt 0 ]]; then - printf "%s requires php >= %s, but %s is provided\n" $pkgname $_min_php $_system_php - exit 1 - fi - if [[ "$(vercmp "$_system_php" "$_max_php" )" -gt 0 ]]; then - printf "%s requires php < %s, but %s is provided\n" $pkgname $_max_php $_system_php - exit 1 - fi -} - -package() { - local _dep_ver="" - _get_php_versions - - if [[ "$_php_interpreter" != *php ]]; then - _dep_ver="${_system_php%%.*}" - fi - - # NOTE: due to weird makepkg checks we can't add optdepends with dynamically derived contents directly - _optdepends=( - "php$_dep_ver-apcu: for caching with APCU" - "php$_dep_ver-apache: to use the Apache web server" - "php$_dep_ver-fpm: to run in fastCGI process manager" - "php$_dep_ver-imagick: for preview generation" - "php$_dep_ver-imap: for external user authentication" - "php$_dep_ver-intl: to increase language translation performance and fix sorting" - "php$_dep_ver-memcached: for caching with memcached" - "php$_dep_ver-pgsql: to use the PostgreSQL database backend" - "php$_dep_ver-redis: for caching with redis" - "php$_dep_ver-sqlite: to use the SQLite database backend" - "uwsgi-plugin-php$_dep_ver: run as application container" - ) - optdepends+=("${_optdepends[@]}") - - cd $pkgname - # 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 ../custom_files/$pkgname.uwsgi "$pkgdir/etc/uwsgi/$pkgname.ini" - # config dir - install -vDm 644 .htaccess -t "$pkgdir/etc/webapps/$pkgname/" - 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 and .htaccess from source so that it is not installed to default location - rm -rf config .htaccess - - # webapp - find . -type f -not -iname "*.orig" -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/" - # symlink .htaccess file into place - ln -sv /etc/webapps/$pkgname/.htaccess "$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 ../custom_files/$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/" - # systemd service - install -vDm 644 ../custom_files/$pkgname-cron.service -t "$pkgdir/usr/lib/systemd/system/" - install -vDm 644 ../$pkgname-cron.timer -t "$pkgdir/usr/lib/systemd/system/" -} Copied: nextcloud/repos/community-staging-any/PKGBUILD (from rev 1195543, nextcloud/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,184 @@ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: David Runge <dv...@archlinux.org> + +pkgname=nextcloud +# NOTE: always check first whether the version is supposed to be packaged: +# https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule +pkgver=24.0.0 +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) +makedepends=(php php-gd) +optdepends=( + 'curl: for webcron 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' + 'mod_itk: to use the Apache web server' + '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' +) +backup=( + etc/webapps/$pkgname/config/config.php + etc/webapps/$pkgname/.htaccess + 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/$pkgname-$pkgver.tar.bz2{,.asc} + apache.example.conf + $pkgname.config.php + $pkgname.hook + $pkgname.occ.sh + $pkgname.sysusers + $pkgname.tmpfiles + $pkgname.uwsgi + $pkgname-cron.service + $pkgname-cron.timer +) +sha512sums=('1a284fb862536a65a9e9ae623a01d94a8116f8b0664861b7fcdce7fc815c50822bc4e7c7dc221698cf72dea294f45026d54d7030448d4e9fa425eb20e39fe072' + 'SKIP' + '5f9be223225e6ad2772989c440df8585a852ea0be697274384064ec73df47dab2f5d0847c275732fab26c419a713911d8f77ebc2b639bf6e8ede76272b752cde' + '92592f9a76ee534d0ae6d3aedf2257c147337debe7e2d6dbec1daff66a682e3abc74611e08662058de314bf3ea6ff1c85efd678674b782d71251c38786e446f9' + '2791382d7b005c64cd6938695f273e83435cc5f1b785fe7d44d6dbd69864c502847e45d93c4a5f6752a759a660118279e3e22e5bc32f79b8775693fde603a9c5' + '20f12f0bb1d0ac735fb86e79e90fb99028e06e0d5a6842d449e443b418442682cad2573cfd4bf8e2a802c2aeb5780bce4647d45054bbc38156ae037802358698' + '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84' + '919008a2bf6cf2492cb1e9c8e28c1e082d74e45da5a96e6669f8971d6cf721e36d23625c89918fe10d8bc1b202c0340aa897849d9ec501a26f3f4572ccb57a98' + '67d32011e3dccf41ecaaeffa7486e70b8ee516b3423796c19cc9c95ba6ecd5d031540eeacefb9423fdfc70b1baad15a4885b7147cfbbb2773b349e72d3fe4df2' + '5034d4f78090a7455521fc2e7e391c8eab06b503979c5f14d4144e52c08717e7fc796e0e3048059b1e5802365667c6f87162b5c403cac971e1b77fc1688596f3' + 'eb69785a5b0df0e2a11f53f9c2e2dbf75681d7c698e88cbcc5ceed713a558d528511cc576813cc083cbaa28a2c83d543a39436ad4805670348ef22634305b1c8') +b2sums=('93ddcf7dc31988914b983449d6c8b7941f333aa153a35fb68d6688b69a3e05693fa212db04a261d3f508d7600f629bcd7b6684eea959ce552f1473897824ad8a' + 'SKIP' + '7d40d120c28291f1a7537f3e1b5049fa83c9c0af949371345ea9ccdf3de4a0f3a3a06edbc52d9254dba483e4d11acf562cf679b9e379c5dfc2f61dfbfc2e4cef' + '4ad061efbc20b4d0e9f8cfd01c5e8e612fa5af29bce754b77f90c1835b98ee445ef4de3d8c83da91461053622620af14d880eb9014b51f2383c75f1860d479f4' + 'c69f18de513562e32f0f655fee7ef81877d74a76717e2eaad9a13882bf8edd0dad99bec5958e460a4ec32eecfdd425ae009d11ac27af16a3ad1d6498282be32f' + 'f3d1423a457c7a24c25c8b18e24b838b63e99a7f7562ded954ea605c76bbd31e8e79158314e1343e341aa21b6a26dc57ca4f00b871bbc170f6b7d5044985e661' + '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db' + 'd132044cb7f1d61a1ce87800d2e1142e3ac385acdec25e2f5ad685603a0ffa88e105f4c35688584d65d287adbb40b8d9a02d6a80d7a0b58bb8801a6769405218' + '67fa7d9207ab3e8309d4adcce734bd25f82bd03f1f88adea7e40adaddebb345b96a793df7960db79f4f39947f5edff61548bb409066b81e3fe643d313e68d66a' + 'fefaf3238475e991c2dc2bda7cda17019d473e8bbafa9817a31a941552c7362e2e12aad1aa925c45a595ab9f0b645b8d4b4236c86ecf8db87e662a7a05ddfcd5' + 'e6214351ca16bfe97683e838e727d6b5eaa62194878272204034c62aac4a632c9b33cd31aa0570c2eb936d7e9e7ff60190ac05a3a8cc2e27eda423a7d89b6d39') +validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <secur...@nextcloud.com> + +_get_php_versions() { + local _phps=(php7 php) + local _min _max + + _min=$(sed -nr 's/^.*PHP_VERSION_ID < ([0-9]*).*$/\1/p' $pkgname/lib/versioncheck.php) + _max=$(sed -nr 's/^.*PHP_VERSION_ID >= ([0-9]*).*$/\1/p' $pkgname/lib/versioncheck.php) + _min_php="${_min:0:1}.${_min:2:1}" + _max_php="${_max:0:1}.${_max:2:1}" + + _php_interpreter="" + for _php in "${_phps[@]}"; do + if command -v "$_php" > /dev/null; then + if [[ -z "$_php_interpreter" ]]; then + _php_interpreter="$_php" + fi + fi + done + _system_php="$($_php_interpreter --version |head -n1 |cut -d ' ' -f2)" + printf "Detected php interpreter %s\n" $_php_interpreter + printf "Detected php %s\n" $_system_php + printf "%s requires %s >= php < %s\n" $pkgname $_min_php $_max_php +} + +prepare() { + local _file + + _get_php_versions + + # setup files with default PHP interpreter + mkdir -vp custom_files + for _file in nextcloud.{occ.sh,uwsgi} nextcloud-cron.service; do + sed "s/PHP_INTERPRETER/$_php_interpreter/g" $_file > custom_files/$_file + done +} + +check() { + _get_php_versions + if [[ "$(vercmp "$_system_php" "$_min_php" )" -lt 0 ]]; then + printf "%s requires php >= %s, but %s is provided\n" $pkgname $_min_php $_system_php + exit 1 + fi + if [[ "$(vercmp "$_system_php" "$_max_php" )" -gt 0 ]]; then + printf "%s requires php < %s, but %s is provided\n" $pkgname $_max_php $_system_php + exit 1 + fi +} + +package() { + local _dep_ver="" + + _get_php_versions + depends=("php<$_max_php" "php-gd<$_max_php") + + # NOTE: this sets up a custom prefix based on the php major version for for a php based package (e.g. php7-apcu) + if [[ "$_php_interpreter" != *php ]]; then + _dep_ver="${_system_php%%.*}" + fi + + # NOTE: due to weird makepkg checks we can't add optdepends with dynamically derived contents directly + _optdepends=( + "php$_dep_ver-apcu: for caching with APCU" + "php$_dep_ver-apache: to use the Apache web server" + "php$_dep_ver-fpm: to run in fastCGI process manager" + "php$_dep_ver-imagick: for preview generation" + "php$_dep_ver-imap: for external user authentication" + "php$_dep_ver-intl: to increase language translation performance and fix sorting" + "php$_dep_ver-memcached: for caching with memcached" + "php$_dep_ver-pgsql: to use the PostgreSQL database backend" + "php$_dep_ver-redis: for caching with redis" + "php$_dep_ver-sqlite: to use the SQLite database backend" + "uwsgi-plugin-php$_dep_ver: run as application container" + ) + optdepends+=("${_optdepends[@]}") + + cd $pkgname + # 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 ../custom_files/$pkgname.uwsgi "$pkgdir/etc/uwsgi/$pkgname.ini" + # config dir + install -vDm 644 .htaccess -t "$pkgdir/etc/webapps/$pkgname/" + 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 and .htaccess from source so that it is not installed to default location + rm -rf config .htaccess + + # webapp + find . -type f -not -iname "*.orig" -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/" + # symlink .htaccess file into place + ln -sv /etc/webapps/$pkgname/.htaccess "$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 ../custom_files/$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/" + # systemd service + install -vDm 644 ../custom_files/$pkgname-cron.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 ../$pkgname-cron.timer -t "$pkgdir/usr/lib/systemd/system/" +} Deleted: apache.example.conf =================================================================== --- apache.example.conf 2022-05-05 21:54:42 UTC (rev 1195543) +++ apache.example.conf 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,21 +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 f...@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> - -<IfModule mpm_itk_module> - AssignUserId nextcloud nextcloud -</IfModule> Copied: nextcloud/repos/community-staging-any/apache.example.conf (from rev 1195543, nextcloud/trunk/apache.example.conf) =================================================================== --- apache.example.conf (rev 0) +++ apache.example.conf 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,21 @@ +<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 f...@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> + +<IfModule mpm_itk_module> + AssignUserId nextcloud nextcloud +</IfModule> Deleted: nextcloud-cron.service =================================================================== --- nextcloud-cron.service 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud-cron.service 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,6 +0,0 @@ -[Unit] -Description=Nextcloud; run cron.php - -[Service] -User=nextcloud -ExecStart=/usr/bin/PHP_INTERPRETER -f /usr/share/webapps/nextcloud/cron.php Copied: nextcloud/repos/community-staging-any/nextcloud-cron.service (from rev 1195543, nextcloud/trunk/nextcloud-cron.service) =================================================================== --- nextcloud-cron.service (rev 0) +++ nextcloud-cron.service 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,6 @@ +[Unit] +Description=Nextcloud; run cron.php + +[Service] +User=nextcloud +ExecStart=/usr/bin/PHP_INTERPRETER -f /usr/share/webapps/nextcloud/cron.php Deleted: nextcloud-cron.timer =================================================================== --- nextcloud-cron.timer 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud-cron.timer 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,9 +0,0 @@ -[Unit] -Description=Nextcloud; run cron.php periodically - -[Timer] -OnBootSec=5min -OnUnitActiveSec=5min - -[Install] -WantedBy=timers.target \ No newline at end of file Copied: nextcloud/repos/community-staging-any/nextcloud-cron.timer (from rev 1195543, nextcloud/trunk/nextcloud-cron.timer) =================================================================== --- nextcloud-cron.timer (rev 0) +++ nextcloud-cron.timer 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,9 @@ +[Unit] +Description=Nextcloud; run cron.php periodically + +[Timer] +OnBootSec=5min +OnUnitActiveSec=5min + +[Install] +WantedBy=timers.target \ No newline at end of file Deleted: nextcloud.config.php =================================================================== --- nextcloud.config.php 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.config.php 2022-05-05 21:55:07 UTC (rev 1195544) @@ -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-staging-any/nextcloud.config.php (from rev 1195543, nextcloud/trunk/nextcloud.config.php) =================================================================== --- nextcloud.config.php (rev 0) +++ nextcloud.config.php 2022-05-05 21:55:07 UTC (rev 1195544) @@ -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 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.hook 2022-05-05 21:55:07 UTC (rev 1195544) @@ -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/occ upgrade Copied: nextcloud/repos/community-staging-any/nextcloud.hook (from rev 1195543, nextcloud/trunk/nextcloud.hook) =================================================================== --- nextcloud.hook (rev 0) +++ nextcloud.hook 2022-05-05 21:55:07 UTC (rev 1195544) @@ -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/occ upgrade Deleted: nextcloud.install =================================================================== --- nextcloud.install 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.install 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,16 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if (( "$(vercmp "$2" '21.0.0-6')" < 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 - if (( "$(vercmp "$2" '22.0.0-1')" < 0 )); then - printf "NOTE: The application's .htaccess file is now located in /etc/webapps/nextcloud/.\n" - fi -} Copied: nextcloud/repos/community-staging-any/nextcloud.install (from rev 1195543, nextcloud/trunk/nextcloud.install) =================================================================== --- nextcloud.install (rev 0) +++ nextcloud.install 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,16 @@ +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if (( "$(vercmp "$2" '21.0.0-6')" < 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 + if (( "$(vercmp "$2" '22.0.0-1')" < 0 )); then + printf "NOTE: The application's .htaccess file is now located in /etc/webapps/nextcloud/.\n" + fi +} Deleted: nextcloud.occ.sh =================================================================== --- nextcloud.occ.sh 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.occ.sh 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -readonly default_config="/etc/php/php.ini" -readonly default_php_command="/usr/bin/PHP_INTERPRETER" -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 Copied: nextcloud/repos/community-staging-any/nextcloud.occ.sh (from rev 1195543, nextcloud/trunk/nextcloud.occ.sh) =================================================================== --- nextcloud.occ.sh (rev 0) +++ nextcloud.occ.sh 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +readonly default_config="/etc/php/php.ini" +readonly default_php_command="/usr/bin/PHP_INTERPRETER" +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 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.sysusers 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1 +0,0 @@ -u nextcloud - "Nextcloud user" - - Copied: nextcloud/repos/community-staging-any/nextcloud.sysusers (from rev 1195543, nextcloud/trunk/nextcloud.sysusers) =================================================================== --- nextcloud.sysusers (rev 0) +++ nextcloud.sysusers 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1 @@ +u nextcloud - "Nextcloud user" - - Deleted: nextcloud.tmpfiles =================================================================== --- nextcloud.tmpfiles 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.tmpfiles 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,9 +0,0 @@ -Z /etc/webapps/nextcloud/config - nextcloud nextcloud -z /etc/webapps/nextcloud/.htaccess 0644 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 -d %S/nextcloud 0755 nextcloud nextcloud -d %S/nextcloud/apps 0755 nextcloud nextcloud -d %S/nextcloud/data 0770 nextcloud nextcloud Copied: nextcloud/repos/community-staging-any/nextcloud.tmpfiles (from rev 1195543, nextcloud/trunk/nextcloud.tmpfiles) =================================================================== --- nextcloud.tmpfiles (rev 0) +++ nextcloud.tmpfiles 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,9 @@ +Z /etc/webapps/nextcloud/config - nextcloud nextcloud +z /etc/webapps/nextcloud/.htaccess 0644 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 +d %S/nextcloud 0755 nextcloud nextcloud +d %S/nextcloud/apps 0755 nextcloud nextcloud +d %S/nextcloud/data 0770 nextcloud nextcloud Deleted: nextcloud.uwsgi =================================================================== --- nextcloud.uwsgi 2022-05-05 21:54:42 UTC (rev 1195543) +++ nextcloud.uwsgi 2022-05-05 21:55:07 UTC (rev 1195544) @@ -1,82 +0,0 @@ -[uwsgi] -procname-master = %n -plugins = PHP_INTERPRETER -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_INTERPRETER/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 webcron job every five minutes -# cron = -5 -1 -1 -1 -1 curl --silent https://change.me.tld/cron.php 1>/dev/null -# uncomment to run a cron job every five minutes -# cron = -5 -1 -1 -1 -1 php -f /usr/share/webapps/%n/cron.php Copied: nextcloud/repos/community-staging-any/nextcloud.uwsgi (from rev 1195543, nextcloud/trunk/nextcloud.uwsgi) =================================================================== --- nextcloud.uwsgi (rev 0) +++ nextcloud.uwsgi 2022-05-05 21:55:07 UTC (rev 1195544) @@ -0,0 +1,82 @@ +[uwsgi] +procname-master = %n +plugins = PHP_INTERPRETER +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_INTERPRETER/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 webcron job every five minutes +# cron = -5 -1 -1 -1 -1 curl --silent https://change.me.tld/cron.php 1>/dev/null +# uncomment to run a cron job every five minutes +# cron = -5 -1 -1 -1 -1 php -f /usr/share/webapps/%n/cron.php