Commit 1433e818a15d053d150642f0c6e11834f8105d38

Authored by nollieheel
1 parent 7836b955

Version v0.5.1. Disable default install of php5-zip extension.

  1 +## 0.5.1 - 2016-11-29
  2 +### Fixed
  3 +- Disable default installation of php5-zip extension if on Ubuntu and not PHP5.6 because there is no such package.
  4 +
1 ## 0.5.0 - 2016-11-22 5 ## 0.5.0 - 2016-11-22
2 ### Added 6 ### Added
3 - PHP-FPM recipe: Add support for PHP5.6-FPM on Ubuntu. On other platforms, setting the version to '5.6' will generate a fatal error. 7 - PHP-FPM recipe: Add support for PHP5.6-FPM on Ubuntu. On other platforms, setting the version to '5.6' will generate a fatal error.
@@ -28,9 +28,13 @@ default['cfe-nginx-php-fpm']['php-fpm']['version'] = '5.5' @@ -28,9 +28,13 @@ default['cfe-nginx-php-fpm']['php-fpm']['version'] = '5.5'
28 # If your php-fpm pool is not named 'www', then delete 28 # If your php-fpm pool is not named 'www', then delete
29 # the default one ('www'), which is automatically installed by php-fpm 29 # the default one ('www'), which is automatically installed by php-fpm
30 default['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] = true 30 default['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] = true
31 -default['cfe-nginx-php-fpm']['php-fpm']['exts'] = %w{  
32 - mysqlnd cli curl zip  
33 -} 31 +
  32 +default['cfe-nginx-php-fpm']['php-fpm']['exts'] =
  33 + if node['cfe-nginx-php-fpm']['php-fpm']['version'] == '5.6'
  34 + %w{ mysqlnd cli curl zip }
  35 + else
  36 + %w{ mysqlnd cli curl }
  37 + end
34 38
35 default['cfe-nginx-php-fpm']['openssl']['dh_modulus'] = 4096 39 default['cfe-nginx-php-fpm']['openssl']['dh_modulus'] = 4096
36 40
@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com' @@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
4 license 'Apache License' 4 license 'Apache License'
5 description 'Simplifies setup of Nginx+PHP-FPM in Chromedia.' 5 description 'Simplifies setup of Nginx+PHP-FPM in Chromedia.'
6 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 6 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7 -version '0.5.0' 7 +version '0.5.1'
8 8
9 { 9 {
10 'openssl' => '4.4.0', 10 'openssl' => '4.4.0',