From: gggeek Date: Wed, 23 Nov 2022 16:53:08 +0000 (+0000) Subject: more CI fixes X-Git-Tag: 4.9.0~39 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c225648e937a596051acdcef8d37cb98f280d6cd;p=plcapi.git more CI fixes --- diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index 76abed6f..fcae3b8a 100755 --- a/tests/ci/setup/setup_php.sh +++ b/tests/ci/setup/setup_php.sh @@ -74,8 +74,8 @@ else # we have to do this as the init script we get for starting/stopping php-fpm seems to be faulty... pkill php-fpm echo 'listen = /run/php/php-fpm.sock' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf" - echo 'listen.owner = docker' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf" - echo 'listen.group = docker' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf" + # the user running apache will be different in GHA and local VMS. We just open fully perms on the fpm socket + echo 'listen.mode = 0666' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf" cp "$SCRIPT_DIR/../config/apache_phpfpm_proxyfcgi" "/etc/apache2/conf-available/php${PHP_VERSION}-fpm.conf" else DEBIAN_FRONTEND=noninteractive apt-get install -y language-pack-en-base software-properties-common