Update cookbooks
This commit is contained in:
@@ -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 ]
|
||||
|
||||
Reference in New Issue
Block a user