From: gggeek <giunta.gaetano@gmail.com>
Date: Sun, 15 Mar 2015 22:25:00 +0000 (+0000)
Subject: 2nd try at travis/apache
X-Git-Tag: 4.0.0-alpha^2~173
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=09bea8a40014c810cd773daf3d6535daf61e245a;p=plcapi.git

2nd try at travis/apache
---

diff --git a/.travis.yml b/.travis.yml
index 8d7f4820..b6b4cb50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,19 +8,19 @@ php:
   - 7.0
   - hhvm
 
+before_install:
+  - sudo apt-get update -qq
+
 install:
   - composer self-update && composer install
+  - sudo apt-get install -y apache2 libapache2-mod-fastcgi
 
 before_script:
   # Disable xdebug. NB: this should NOT be done for hhvm...
   - if [ $TRAVIS_PHP_VERSION != "hhvm" -a $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-rm xdebug.ini; fi
 
-  # TODO: we should set up an Apache instance inside the Travis VM and test it.
-  # But it looks a bit complex, esp. as it seems that php has to be set up differently (cgi vs fpm) depending on version
-  # So for now we just take an easy way out using a known remote server.
-  # See: https://gist.github.com/roderik/3123962
+  # We set up an Apache instance inside the Travis VM and test it.
   # See: http://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
-  - sudo apt-get install apache2 libapache2-mod-fastcgi
 
   # enable php-fpm
   - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf