From b47dc8a394ac172db821d723fe17e24bed7b80ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 18 Dec 2015 20:10:11 +0100
Subject: [PATCH] Fix to use new travis setup

---
 .travis.yml                 |  1 +
 build/travis-ci/apache.conf | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 build/travis-ci/apache.conf

diff --git a/.travis.yml b/.travis.yml
index 505c4aade29..6a6802af911 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,6 +113,7 @@ before_script:
   echo Start travis
   echo Current dir is `pwd`
   echo Home dir is `echo ~`
+  echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
 
 - |
   echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
diff --git a/build/travis-ci/apache.conf b/build/travis-ci/apache.conf
new file mode 100644
index 00000000000..5ba713924f2
--- /dev/null
+++ b/build/travis-ci/apache.conf
@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+  DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
+
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
+    Options FollowSymLinks MultiViews ExecCGI
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+  </Directory>
+
+  # Wire up Apache to use Travis CI's php-fpm.
+  <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>
-- 
GitLab