From: gggeek <giunta.gaetano@gmail.com>
Date: Sat, 1 Jul 2017 14:47:12 +0000 (+0100)
Subject: travis fixes
X-Git-Tag: 3.1.0~8
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=43924620e4797b682e57ee7da44ab76c97df905f

travis fixes
---

diff --git a/test/ci/travis/setup_apache.sh b/test/ci/travis/setup_apache.sh
index cd85e4d..b9d2465 100755
--- a/test/ci/travis/setup_apache.sh
+++ b/test/ci/travis/setup_apache.sh
@@ -6,6 +6,7 @@
 sudo a2enmod rewrite actions fastcgi alias ssl
 
 # configure apache virtual hosts
+sudo a2dissite 000-default.conf
 sudo cp -f test/ci/travis/apache_vhost /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
diff --git a/test/ci/travis/setup_apache_hhvm.sh b/test/ci/travis/setup_apache_hhvm.sh
index 6910ccf..76dbef8 100755
--- a/test/ci/travis/setup_apache_hhvm.sh
+++ b/test/ci/travis/setup_apache_hhvm.sh
@@ -6,6 +6,7 @@
 sudo a2enmod rewrite actions fastcgi alias ssl
 
 # configure apache virtual hosts
+sudo a2dissite 000-default.conf
 sudo cp -f test/ci/travis/apache_vhost_hhvm /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