wip travis

[plcapi.git] / tests / ci / setup / setup_php_travis.sh

diff --git a/tests/ci/setup/setup_php_travis.sh b/tests/ci/setup/setup_php_travis.sh
index 7f557c9..1d51431 100755 (executable)
--- a/tests/ci/setup/setup_php_travis.sh
+++ b/tests/ci/setup/setup_php_travis.sh
@@ -25,6 +25,8 @@ configure_php_ini ~/.phpenv/versions/${PHPVER}/etc/php.ini
 # configure php-fpm
 cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf
 
+cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf
+
 # work around travis issue #3385
 if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then
     if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then
@@ -45,7 +47,7 @@ fi
 ~/.phpenv/versions/${PHPVER}/sbin/php-fpm
 
 # configure apache for php-fpm via mod_proxy_fcgi
-sudo cp -f "$SCRIPT_DIR/../config/apache_phpfpm_proxyfcgi" "/etc/apache2/conf-available/conf-enabled/php-${PHPVER}fpm.conf"
-sudo sed -i -e "s,/run/php/php-fpm.sock,/run/php/php${PHPVER}-fpm.sock,g" "/etc/apache2/conf-available/conf-enabled/php-${PHPVER}fpm.conf"
+sudo cp -f "$SCRIPT_DIR/../config/apache_phpfpm_proxyfcgi" "/etc/apache2/conf-available/php${PHPVER}-fpm.conf"
+sudo sed -i -e "s,/run/php/php-fpm.sock,/run/php/php${PHPVER}-fpm.sock,g" "/etc/apache2/conf-available/php${PHPVER}-fpm.conf"
 sudo a2enconf php${PHPVER}-fpm
 sudo service apache2 restart