From 8a4f97c66a7d4dce07fece4dc059c0be0a2b6f33 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Fri, 23 Jan 2015 16:19:23 +0100
Subject: split up travis conf

---
 .travis.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2a1da3246..68febcd68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ install:
     - export CHROME_BIN=/usr/bin/chromium-browser
     - sudo easy_install3 requests
     - sudo easy_install3 ocdev
-    - ocdev --version
     # clone core
     - ocdev setup core --dir owncloud --branch master
     - mv news owncloud/apps/
@@ -41,13 +40,7 @@ before_script:
     - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost';"
     - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
     # set up php under apache
-    - 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 /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
+    - bash owncloud/apps/news/tests/travis/travis-ci-apache.sh
     # fill owncloud with default configs and enable news
     - cd owncloud
     - mkdir apps2
-- 
cgit v1.2.3