travis fixes

diff --git a/test/ci/travis/setup_apache.sh b/test/ci/travis/setup_apache.sh
index cd85e4d..b9d2465 100755 (executable)
--- 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 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
 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 (executable)
--- 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 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
 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