From a5f1864bfef179fa1dadc66ccc7469ef461bbd47 Mon Sep 17 00:00:00 2001 From: avsh Date: Thu, 26 Mar 2015 13:14:25 +0300 Subject: [PATCH 1/2] bump php-fpm version to ~> 0.7 --- metadata.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index febe26f..fa3d2af 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.0" +version "3.0.1" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" @@ -21,7 +21,7 @@ depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" depends "nginx", "~> 2.7.4" -depends "php-fpm", "~> 0.6.10" +depends "php-fpm", "~> 0.7" depends 'selinux', '~> 0.7' %w{ debian ubuntu windows centos redhat scientific oracle }.each do |os| From 3bbca795b705cc98501f1cfbd1bbafbfb3a94db4 Mon Sep 17 00:00:00 2001 From: avsh Date: Thu, 26 Mar 2015 15:28:15 +0300 Subject: [PATCH 2/2] use empty hash for php-fpm pools --- metadata.rb | 4 ++-- recipes/nginx.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata.rb b/metadata.rb index fa3d2af..ebe619b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "Apache 2.0" description "Installs/Configures WordPress" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "3.0.1" +version "3.0.0" recipe "WordPress", "Installs and configures WordPress LAMP stack on a single system" recipe "WordPress::languages", "Install WordPress translation files" @@ -21,7 +21,7 @@ depends "iis", ">= 1.6.2" depends "tar", ">= 0.3.1" depends "nginx", "~> 2.7.4" -depends "php-fpm", "~> 0.7" +depends "php-fpm", "~> 0.7.0" depends 'selinux', '~> 0.7' %w{ debian ubuntu windows centos redhat scientific oracle }.each do |os| diff --git a/recipes/nginx.rb b/recipes/nginx.rb index 7820a2b..5720cf8 100644 --- a/recipes/nginx.rb +++ b/recipes/nginx.rb @@ -17,7 +17,7 @@ # limitations under the License. # -node.set_unless['php-fpm']['pools'] = [] +node.set_unless['php-fpm']['pools'] = {} include_recipe "php-fpm"