From 5a9716b0ff4862496f10b62e31ffe8f186a21ebb Mon Sep 17 00:00:00 2001 From: mwiegand Date: Wed, 23 Feb 2022 18:03:05 +0100 Subject: [PATCH] nextcloud supress pcntl error and use json --- bundles/nextcloud/items.py | 2 +- bundles/php/files/php.ini | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bundles/nextcloud/items.py b/bundles/nextcloud/items.py index f0c65df..662c1b6 100644 --- a/bundles/nextcloud/items.py +++ b/bundles/nextcloud/items.py @@ -97,7 +97,7 @@ actions['install_nextcloud'] = { admin_pass=node.metadata.get('nextcloud/admin_pass'), data_dir='/var/lib/nextcloud', ), - 'unless': repo.libs.nextcloud.occ('status') + ' | grep -q "installed: true"', + 'unless': repo.libs.nextcloud.occ('status', output='json') + ' | jq -r .installed | grep -q "^true$"', 'needs': [ 'directory:/etc/nextcloud', 'directory:/opt/nextcloud', diff --git a/bundles/php/files/php.ini b/bundles/php/files/php.ini index 0e1f316..eaabd7f 100644 --- a/bundles/php/files/php.ini +++ b/bundles/php/files/php.ini @@ -7,7 +7,6 @@ output_buffering = 4096 zlib.output_compression = Off implicit_flush = Off serialize_precision = -1 -disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals ignore_user_abort = Off zend.enable_gc = On expose_php = Off