summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-01-23 16:19:23 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2015-01-23 16:19:23 +0100
commit8a4f97c66a7d4dce07fece4dc059c0be0a2b6f33 (patch)
tree8d715d4d7df9dc917310e2ffa15bf5232821af50 /tests
parent551fcc2e32decd32bd9720b3fcdf561cfca45e86 (diff)
split up travis conf
Diffstat (limited to 'tests')
-rw-r--r--tests/travis/travis-ci-apache.conf (renamed from tests/travis/travis-ci-apache)0
-rw-r--r--tests/travis/travis-ci-apache.sh13
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/travis/travis-ci-apache b/tests/travis/travis-ci-apache.conf
index 5cfd3ccd0..5cfd3ccd0 100644
--- a/tests/travis/travis-ci-apache
+++ b/tests/travis/travis-ci-apache.conf
diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh
new file mode 100644
index 000000000..d8a514a72
--- /dev/null
+++ b/tests/travis/travis-ci-apache.sh
@@ -0,0 +1,13 @@
+# set up php under apache
+if [[ $(phpenv version-name) != 'hhvm' ]]; then
+ 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
+
+fi
+
+sudo service apache2 restart \ No newline at end of file