summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-16 15:51:41 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-16 15:51:41 +0200
commit6f199e0c0adf825d905147de54ae801bd51c588b (patch)
tree937f02c1018da4df0399e17cf87e5a50b586e326 /.travis.yml
parentb12b653f40f17f79aa0cf2990edf2584b8266658 (diff)
apache here we go
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 8c34f53dc..e2c7fd3aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,15 +29,13 @@ before_script:
- mysql -e 'create database oc_autotest;'
- mysql -u root -e "CREATE USER 'oc_autotest'@'localhost'";
- mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost'";
- # FIXME: apache setup needs to work that the directory above is served from
- # httpd
- #- 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 tests/travis/travis-ci-apache /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 ~/.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 tests/travis/travis-ci-apache /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
- cd owncloud
- ocdev ci $DB
- php -f console.php app:enable news