Update cookbooks

cookbooks/php-fpm/recipes/configure.rb

@@ -28,7 +28,13 @@ end
 
 if node['php-fpm']['pools']
   node['php-fpm']['pools'].each do |pool|
-    php_fpm_pool pool[:name] do
+    if pool.is_a?(Array)
+      pool_name = pool[0]
+      pool = pool[1]
+    else
+      pool_name = pool[:name]
+    end
+    php_fpm_pool pool_name do
       pool.each do |k, v|
         self.params[k.to_sym] = v
       end

cookbooks/php-fpm/recipes/install.rb

@@ -19,9 +19,10 @@
 #
 
 include_recipe 'php-fpm::repository' unless node['php-fpm']['skip_repository_install']
+include_recipe 'apt::default' if node['platform_family'] == 'debian'
 
 if node['php-fpm']['package_name'].nil?
-  if platform_family?("rhel")
+  if platform_family?("rhel", "fedora")
     php_fpm_package_name = "php-fpm"
   else
     php_fpm_package_name = "php5-fpm"
@@ -31,7 +32,8 @@ else
 end
 
 package php_fpm_package_name do
-  action :upgrade
+  action node['php-fpm']['installation_action']
+  version node['php-fpm']['version'] if node['php-fpm']['version']
 end
 
 if node['php-fpm']['service_name'].nil?
@@ -40,13 +42,9 @@ else
   php_fpm_service_name = node['php-fpm']['service_name']
 end
 
-service_provider = nil
-if node['platform'] == 'ubuntu' and node['platform_version'].to_f >= 13.10
-  service_provider = ::Chef::Provider::Service::Upstart
-end
+directory node['php-fpm']['log_dir']
 
 service "php-fpm" do
-  provider service_provider if service_provider
   service_name php_fpm_service_name
   supports :start => true, :stop => true, :restart => true, :reload => true
   action [ :enable, :start ]

cookbooks/php-fpm/recipes/repository.rb

@@ -40,33 +40,33 @@ when 'debian'
   # http://www.dotdeb.org/instructions/
   if node.platform_version.to_f >= 7.0
     apt_repository "dotdeb" do
-      uri "http://packages.dotdeb.org"
+      uri node['php-fpm']['dotdeb_repository']['uri']
       distribution "stable"
       components ['all']
-      key "http://www.dotdeb.org/dotdeb.gpg"
+      key node['php-fpm']['dotdeb_repository']['key']
       action :add
     end
   elsif node.platform_version.to_f >= 6.0
     apt_repository "dotdeb" do
-      uri "http://packages.dotdeb.org"
+      uri node['php-fpm']['dotdeb_repository']['uri']
       distribution "squeeze"
       components ['all']
-      key "http://www.dotdeb.org/dotdeb.gpg"
+      key node['php-fpm']['dotdeb_repository']['key']
       action :add
     end
   else
     apt_repository "dotdeb" do
-      uri "http://packages.dotdeb.org"
+      uri node['php-fpm']['dotdeb_repository']['uri']
       distribution "oldstable"
       components ['all']
-      key "http://www.dotdeb.org/dotdeb.gpg"
+      key node['php-fpm']['dotdeb_repository']['key']
       action :add
     end
     apt_repository "dotdeb-php53" do
-      uri "http://php53.dotdeb.org"
+      uri node['php-fpm']['dotdeb-php53_repository']['uri']
       distribution "oldstable"
       components ['all']
-      key "http://www.dotdeb.org/dotdeb.gpg"
+      key node['php-fpm']['dotdeb_repository']['key']
       action :add
     end
   end