Date: Thursday, March 30, 2023 @ 21:44:03 Author: dvzrv Revision: 1431341
Default to using php-legacy in configs and scripts (https://bugs.archlinux.org/task/78028). Modified: nextcloud/trunk/PKGBUILD nextcloud/trunk/nextcloud-cron.service nextcloud/trunk/nextcloud.occ.sh nextcloud/trunk/nextcloud.uwsgi ------------------------+ PKGBUILD | 18 +++--------------- nextcloud-cron.service | 2 +- nextcloud.occ.sh | 4 ++-- nextcloud.uwsgi | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-30 21:32:06 UTC (rev 1431340) +++ PKGBUILD 2023-03-30 21:44:03 UTC (rev 1431341) @@ -96,18 +96,6 @@ done } -prepare() { - local _file - - _get_php_versions - - # setup custom files with default PHP interpreter, etc. - install -vDm 644 nextcloud.{occ.sh,uwsgi} nextcloud-cron.service -t custom_files/ - for _file in custom_files/*; do - sed -e "s/PHP_INTERPRETER/$_php_interpreter/g;s/UWSGI_PLUGIN/${_php_interpreter/-/_}/g" -i $_file - done -} - check() { _get_php_versions if [[ "$(vercmp "$_php_interpreter_version" "$_min_php" )" -lt 0 ]]; then @@ -159,7 +147,7 @@ # log dir install -vdm 755 "$pkgdir/var/log/$pkgname/" # uwsgi integration - install -vDm 644 ../custom_files/$pkgname.uwsgi "$pkgdir/etc/uwsgi/$pkgname.ini" + install -vDm 644 ../$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" @@ -179,12 +167,12 @@ # 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" + 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/" # systemd service - install -vDm 644 ../custom_files/$pkgname-cron.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 ../$pkgname-cron.service -t "$pkgdir/usr/lib/systemd/system/" install -vDm 644 ../$pkgname-cron.timer -t "$pkgdir/usr/lib/systemd/system/" } Modified: nextcloud-cron.service =================================================================== --- nextcloud-cron.service 2023-03-30 21:32:06 UTC (rev 1431340) +++ nextcloud-cron.service 2023-03-30 21:44:03 UTC (rev 1431341) @@ -4,4 +4,4 @@ [Service] KillMode=mixed User=nextcloud -ExecStart=/usr/bin/PHP_INTERPRETER -f /usr/share/webapps/nextcloud/cron.php +ExecStart=/usr/bin/php-legacy -f /usr/share/webapps/nextcloud/cron.php Modified: nextcloud.occ.sh =================================================================== --- nextcloud.occ.sh 2023-03-30 21:32:06 UTC (rev 1431340) +++ nextcloud.occ.sh 2023-03-30 21:44:03 UTC (rev 1431341) @@ -1,7 +1,7 @@ #!/usr/bin/env bash -readonly default_config="/etc/PHP_INTERPRETER/php.ini" -readonly default_php_command="/usr/bin/PHP_INTERPRETER" +readonly default_config="/etc/php-legacy/php.ini" +readonly default_php_command="/usr/bin/php-legacy" readonly default_user="nextcloud" readonly preserved_environment_vars="NEXTCLOUD_CONFIG_DIR" Modified: nextcloud.uwsgi =================================================================== --- nextcloud.uwsgi 2023-03-30 21:32:06 UTC (rev 1431340) +++ nextcloud.uwsgi 2023-03-30 21:44:03 UTC (rev 1431341) @@ -1,6 +1,7 @@ [uwsgi] procname-master = %n -plugins = UWSGI_PLUGIN +# change to php to use latest PHP +plugins = php_legacy master = true socket = /run/%n/%n.sock # uncomment for a stats socket, that can be used with uwsgitop @@ -18,6 +19,8 @@ cloud_data_dir = /var/lib/nextcloud/data cloud_writable_apps_dir = /var/lib/nextcloud/apps +# change to /usr/lib/php/modules to use latest PHP +php_modules_dir = /usr/lib/php_legacy/modules chdir = %(cloud_data_dir) php-allowed-ext = .php @@ -24,7 +27,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):/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 = open_basedir=%(cloud_data_dir):%(cloud_writable_apps_dir):/var/lib/%n:/tmp/:/usr/share/webapps/%n:/etc/webapps/%n:/dev/urandom:%(php_modules_dir):/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 @@ -55,10 +58,7 @@ 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=intl php-set = extension=iconv php-set = extension=ldap # uncomment if php-memcached is installed and used @@ -72,6 +72,7 @@ # uncomment if php-redis is installed and used (requires php-igbinary) # php-set = extension=redis php-set = extension=sockets +php-set = extension=sysvsem # uncomment if php-xsl is installed and used # php-set = extension=xsl php-set = extension=zip @@ -78,5 +79,6 @@ # 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_INTERPRETER -f /usr/share/webapps/%n/cron.php + +# uncomment to run a cron job every five minutes (change to php to use latest PHP) +# cron = -5 -1 -1 -1 -1 php-legacy -f /usr/share/webapps/%n/cron.php
