diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-16 00:13:56 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-16 00:13:56 +0200 |
| commit | 4b07379f6944e6f888de45828a29e4e7dcdfbdb8 (patch) | |
| tree | d63fd73b2e93c01af7427eb4e1cf75238f5865f6 /.travis.yml | |
| parent | d6130d150fb2754c1400bab3ca6677f98fcdf9f1 (diff) | |
try to use default apache config
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index d0071a290..6c2509ac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,13 +40,14 @@ before_script: - ocdev ci $DB - cd apps/news # enable php-fpm - - 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 ~/.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 # configure apache virtual hosts - - 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 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 sed -i -e "s,/var/www,$(pwd)/web,g" /etc/apache2/sites-available/default - sudo service apache2 restart script: |