From ca57a23c74972cfd6fae0e8a79d7f5e8226c6077 Mon Sep 17 00:00:00 2001 From: gggeek Date: Sat, 21 Mar 2015 00:24:07 +0000 Subject: [PATCH] Try using localhost for https tests on Travis --- .travis.yml | 2 +- tests/ci/travis/setup_apache.sh | 3 ++- tests/ci/travis/setup_apache_hhvm.sh | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f0c4212..70c2801b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_script: script: # to have code coverage: --coverage-clover=coverage.clover - phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php PROXY=localhost:8080 + phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 after_failure: - cat apache_error.log diff --git a/tests/ci/travis/setup_apache.sh b/tests/ci/travis/setup_apache.sh index bdb57498..d375e68e 100755 --- a/tests/ci/travis/setup_apache.sh +++ b/tests/ci/travis/setup_apache.sh @@ -3,7 +3,8 @@ # enable php-fpm # @see https://github.com/travis-ci/travis-ci.github.com/blob/master/docs/user/languages/php.md#apache--php -sudo a2enmod rewrite actions fastcgi alias +sudo a2enmod rewrite actions fastcgi alias ssl +sudo a2ensite default-ssl # enable php-fpm sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf diff --git a/tests/ci/travis/setup_apache_hhvm.sh b/tests/ci/travis/setup_apache_hhvm.sh index b604f831..80ed1c00 100755 --- a/tests/ci/travis/setup_apache_hhvm.sh +++ b/tests/ci/travis/setup_apache_hhvm.sh @@ -3,7 +3,8 @@ # enable hhvm-fcgi # @see https://github.com/travis-ci/travis-ci.github.com/blob/master/docs/user/languages/php.md#apache--php -sudo a2enmod rewrite actions fastcgi alias +sudo a2enmod rewrite actions fastcgi alias ssl +sudo a2ensite default-ssl # start HHVM hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true -- 2.47.0