travis

[plcapi.git] / tests / ci / travis / setup_apache.sh

diff --git a/tests/ci/travis/setup_apache.sh b/tests/ci/travis/setup_apache.sh
index bdb5749..0ce2f18 100755 (executable)
--- a/tests/ci/travis/setup_apache.sh
+++ b/tests/ci/travis/setup_apache.sh
@@ -1,21 +1,15 @@
 #!/bin/sh
 
-# enable php-fpm
-# @see https://github.com/travis-ci/travis-ci.github.com/blob/master/docs/user/languages/php.md#apache--php
+# make sure all files and folders are accessible by Apache
+sudo find / -type d -exec chmod 755 {} \;
+sudo find . -type f -name "*.php" -exec chmod 644 {} \;
 
-sudo a2enmod rewrite actions fastcgi alias
+# set up Apache for php-fpm
+# @see https://github.com/travis-ci/travis-ci.github.com/blob/master/docs/user/languages/php.md#apache--php
 
-# enable php-fpm
-sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-# work around travis issue #3385
-if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
-  sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
-fi
-echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+sudo a2enmod rewrite actions fastcgi alias ssl
 
 # configure apache virtual hosts
-sudo cp -f tests/ci/travis/apache_vhost /etc/apache2/sites-available/default
-sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+sudo cp -f tests/ci/travis/apache_vhost /etc/apache2/sites-available/000-default.conf
+sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
 sudo service apache2 restart