summaryrefslogtreecommitdiffstats
path: root/tests/travis/travis-ci-apache.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tests/travis/travis-ci-apache.sh')
-rw-r--r--tests/travis/travis-ci-apache.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh
index d8a514a72..cfa085cac 100644
--- a/tests/travis/travis-ci-apache.sh
+++ b/tests/travis/travis-ci-apache.sh
@@ -1,13 +1,17 @@
# set up php under apache
-if [[ $(phpenv version-name) != 'hhvm' ]]; then
+if [[ $(phpenv version-name) == 'hhvm' ]]; then
+ sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache-hhvm.conf /etc/apache2/sites-available/default
+ sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+ sudo service apache2 restart
+ hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true
+else
sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
sudo a2enmod rewrite actions fastcgi alias
echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache.conf /etc/apache2/sites-available/default
sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-else
-
+ sudo service apache2 restart
fi
-sudo service apache2 restart \ No newline at end of file
+