Merge remote-tracking branch 'origin/master' into add-locale-support

Oefenweb · Mar 18, 2016 · 21530f9 · 21530f9
2 parents 672dcf3 + 52fca49
commit 21530f9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,6 @@ dist: trusty
 language: python
 python: "2.7"
 
-services:
-  - mysql
-
 env:
   - ANSIBLE_VERSION=latest
   - ANSIBLE_VERSION=2.0.1.0
@@ -53,7 +50,13 @@ before_install:
   - sudo apt-get update -qq
 
   # Install and configure dependencies
-  - sudo apt-get install --yes wget apache2 php5 php5-mysql libapache2-mod-php5
+  - sudo apt-get install --yes wget apache2 php5 php5-mysql libapache2-mod-php5 mysql-server
+
+  # Remove default index page of trusty
+  - sudo rm -f /var/www/index.html || true
+  # Fix default document root of trusty
+  - sudo sed -i 's|/var/www/html|/var/www|g' /etc/apache2/sites-available/000-default.conf || true
+
   - sudo a2enmod rewrite
   - sudo service apache2 reload