Merge pull request #24 from hollodotme/1.x-dev

Fix php-fpm pool configs for travis CI build
hollodotme · Oct 30, 2018 · fb06804 · fb06804
2 parents e32f110 + 692a8d0
commit fb06804
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,8 @@ before_script:
  - echo $(phpenv version-name)
  - sudo mkdir -pm 0777 /var/run
  - sudo usermod -a -G travis www-data
- - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
+ - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+ - echo -e "[global]\ninclude=/home/travis/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/*.conf" > ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
  - sudo cp env/php-fpm/$(phpenv version-name)/network-socket.pool.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/network-socket.pool.conf
  - sudo cp env/php-fpm/$(phpenv version-name)/unix-domain-socket.pool.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/unix-domain-socket.pool.conf
  - sudo cp env/php-fpm/$(phpenv version-name)/restricted-unix-domain-socket.pool.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/restricted-unix-domain-socket.pool.conf