From 7738ee6ad0c273450d6d01379e87b631aca7603b Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 16:00:07 +0100 Subject: remove obsolete travis configs --- tests/travis/php.ini | 2 -- tests/travis/travis-ci-apache-hhvm.conf | 25 ------------------------- tests/travis/travis-ci-apache.conf | 19 ------------------- tests/travis/travis-ci-apache.sh | 18 ------------------ 4 files changed, 64 deletions(-) delete mode 100644 tests/travis/php.ini delete mode 100644 tests/travis/travis-ci-apache-hhvm.conf delete mode 100644 tests/travis/travis-ci-apache.conf delete mode 100644 tests/travis/travis-ci-apache.sh (limited to 'tests') diff --git a/tests/travis/php.ini b/tests/travis/php.ini deleted file mode 100644 index 09fc2d51c..000000000 --- a/tests/travis/php.ini +++ /dev/null @@ -1,2 +0,0 @@ -default_charset = "UTF-8" -always_populate_raw_post_data = -1 diff --git a/tests/travis/travis-ci-apache-hhvm.conf b/tests/travis/travis-ci-apache-hhvm.conf deleted file mode 100644 index dbfbfae2c..000000000 --- a/tests/travis/travis-ci-apache-hhvm.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - DocumentRoot %TRAVIS_BUILD_DIR% - - - Options FollowSymLinks MultiViews ExecCGI - AllowOverride All - Order deny,allow - Allow from all - - - # Configure Apache for HHVM FastCGI. - # See https://github.com/facebook/hhvm/wiki/fastcgi. - - - SetHandler hhvm-php-extension - - - Alias /hhvm /hhvm - Action hhvm-php-extension /hhvm virtual - - FastCgiExternalServer /hhvm -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 300 - - - diff --git a/tests/travis/travis-ci-apache.conf b/tests/travis/travis-ci-apache.conf deleted file mode 100644 index 5cfd3ccd0..000000000 --- a/tests/travis/travis-ci-apache.conf +++ /dev/null @@ -1,19 +0,0 @@ - - - DocumentRoot %TRAVIS_BUILD_DIR% - - - Options FollowSymLinks MultiViews ExecCGI - AllowOverride All - Order deny,allow - Allow from all - - - - AddHandler php5-fcgi .php - Action php5-fcgi /php5-fcgi - Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization - - - \ No newline at end of file diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh deleted file mode 100644 index 24af96be5..000000000 --- a/tests/travis/travis-ci-apache.sh +++ /dev/null @@ -1,18 +0,0 @@ -# set up php under apache -if [[ $(phpenv version-name) == 'hhvm' ]]; then - sudo a2enmod rewrite actions fastcgi alias - sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache-hhvm.conf /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 - hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true -else - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - sudo a2enmod rewrite actions fastcgi alias - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm - sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache.conf /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 -fi - - -- cgit v1.2.3