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
old mode 100644 (file)
new mode 100755 (executable)
index 35f1684..1d51431
--- a/tests/ci/setup/setup_php_travis.sh
+++ b/tests/ci/setup/setup_php_travis.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
+# To be kept in sync with setup_php.sh
+
 set -e
 
+SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
+
 configure_php_ini() {
-    # @todo make this idempotent so that it can be run multiple times in a row
     echo "cgi.fix_pathinfo = 1" >> "${1}"
     echo "always_populate_raw_post_data = -1" >> "${1}"
 
@@ -22,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
@@ -38,8 +43,11 @@ if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then
     fi
 fi
 
+# @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ?
 ~/.phpenv/versions/${PHPVER}/sbin/php-fpm
 
-# @todo configure apache for php-fpm via mod_proxy_fcgi...
+# configure apache for php-fpm via mod_proxy_fcgi
+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