X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fci%2Fsetup%2Fsetup_php.sh;h=cc72a7f2d6fe02eaf89548f42a8a40deab096384;hb=34d380712153dd582dbd548d8c1044e7649d4a0e;hp=ad16d3db0b5add9a5f5dd7d2c3ea1556a6f9d6c0;hpb=8ccaf4d728232a7537ab964885c526175cb20e09;p=plcapi.git diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index ad16d3d..cc72a7f 100755 --- a/tests/ci/setup/setup_php.sh +++ b/tests/ci/setup/setup_php.sh @@ -57,9 +57,18 @@ PHPVER=$(php -r 'echo implode(".",array_slice(explode(".",PHP_VERSION),0,2));' 2 configure_php_ini /etc/php/${PHPVER}/fpm/php.ini -# use a nice name for the php-fpm service, so that it does not depend on php version running +# use a nice name for the php-fpm service, so that it does not depend on php version running. Try to make that work +# both for docker and VMs service "php${PHPVER}-fpm" stop -ln -s "/etc/init.d/php${PHPVER}-fpm" /etc/init.d/php-fpm +if [ -f "/etc/init.d/php${PHPVER}-fpm" ]; then + ln -s "/etc/init.d/php${PHPVER}-fpm" /etc/init.d/php-fpm +fi +if [ -f "/lib/systemd/system/php${PHPVER}-fpm.service" ]; then + ln -s "/lib/systemd/system/php${PHPVER}-fpm.service" /lib/systemd/system/php-fpm.service + if [ ! -f /.dockerenv ]; then + systemctl daemon-reload + fi +fi # @todo shall we configure php-fpm?