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 +--------
 tests/travis/travis-ci-apache      | 19 -------------------
 tests/travis/travis-ci-apache.conf | 19 +++++++++++++++++++
 tests/travis/travis-ci-apache.sh   | 13 +++++++++++++
 4 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 tests/travis/travis-ci-apache
 create mode 100644 tests/travis/travis-ci-apache.conf
 create mode 100644 tests/travis/travis-ci-apache.sh

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
diff --git a/tests/travis/travis-ci-apache b/tests/travis/travis-ci-apache
deleted file mode 100644
index 5cfd3ccd0..000000000
--- a/tests/travis/travis-ci-apache
+++ /dev/null
@@ -1,19 +0,0 @@
-<VirtualHost *:80>
-
-  DocumentRoot %TRAVIS_BUILD_DIR%
-
-  <Directory "%TRAVIS_BUILD_DIR%">
-    Options FollowSymLinks MultiViews ExecCGI
-    AllowOverride All
-    Order deny,allow
-    Allow from all
-  </Directory>
-
-  <IfModule mod_fastcgi.c>
-    AddHandler php5-fcgi .php
-    Action php5-fcgi /php5-fcgi
-    Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-    FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-  </IfModule>
-
-</VirtualHost>
\ No newline at end of file
diff --git a/tests/travis/travis-ci-apache.conf b/tests/travis/travis-ci-apache.conf
new file mode 100644
index 000000000..5cfd3ccd0
--- /dev/null
+++ b/tests/travis/travis-ci-apache.conf
@@ -0,0 +1,19 @@
+<VirtualHost *:80>
+
+  DocumentRoot %TRAVIS_BUILD_DIR%
+
+  <Directory "%TRAVIS_BUILD_DIR%">
+    Options FollowSymLinks MultiViews ExecCGI
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+  </Directory>
+
+  <IfModule mod_fastcgi.c>
+    AddHandler php5-fcgi .php
+    Action php5-fcgi /php5-fcgi
+    Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
+    FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
+  </IfModule>
+
+</VirtualHost>
\ No newline at end of file
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
-- 
cgit v1.2.3