Bläddra i källkod

Minor - Add php5-fpm process stop before reconfiguration

Yannick Warnier 10 år sedan
förälder
incheckning
7e7fe34030
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      .travis.yml

+ 2 - 1
.travis.yml

@@ -18,12 +18,13 @@ before_script:
   - composer -v update
   - phpenv config-add tests/travis-php-config.ini
   # enable php-fpm
+  - sudo service php5-fpm stop
   - 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-ci-apache /etc/apache2/sites-available/default
+  - sudo cp -f tests/travis-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
   # install Chash, a database, and then install Chamilo