Permalink
Browse files

Ensure we 'reload'.

Ensure we use a notification.
  • Loading branch information...
1 parent 5cf59b0 commit ff839b035be9e8296068eb50b47228af88c3e689 @till committed Sep 24, 2012
@@ -1,4 +1,7 @@
+include_recipe "php-fpm::service"
+
cookbook_file "#{node["php-fpm"][:prefix]}/etc/php/apc.ini" do
- source "apc.ini"
- mode "0644"
+ source "apc.ini"
+ mode "0644"
+ notifies :reload, resources(:service => "php-fpm"), :delayed
end
@@ -46,7 +46,7 @@
)
owner node["php-fpm"][:user]
group node["php-fpm"][:group]
- notifies :restart, resources(:service => "php-fpm"), :delayed
+ notifies :reload, resources(:service => "php-fpm"), :delayed
end
template "#{etc_cli_dir}/#{conf_cli}" do
@@ -66,11 +66,11 @@
source "php-fpm.conf.erb"
owner node["php-fpm"][:user]
group node["php-fpm"][:group]
- notifies :restart, resources(:service => "php-fpm"), :delayed
+ notifies :reload, resources(:service => "php-fpm"), :delayed
end
service "php-fpm" do
- action :enable
+ action :enable, :start
end
template "/etc/logrotate.d/php" do
@@ -1,12 +1,7 @@
include_recipe "apt::ppa"
include_recipe "apt::easybib"
-
-package "php5-easybib-gearman" do
- notifies :restart, resources(:service => "php-fpm"), :delayed
-end
-
include_recipe "php-fpm::service"
-service "php-fpm" do
- action :restart
+package "php5-easybib-gearman" do
+ notifies :reload, resources(:service => "php-fpm"), :delayed
end
@@ -3,5 +3,5 @@
execute "ensure extension is loaded" do
command "cat 'extension=mysqlnd_uh.so' > /usr/local/etc/php/mysqlnd_uh.ini"
- notifies :restart, resources( :service => "php-fpm" ), :delayed
+ notifies :reload, resources( :service => "php-fpm" ), :delayed
end
@@ -3,6 +3,6 @@
template "/usr/local/etc/php/suhosin.ini" do
source "suhosin.ini.erb"
mode "0644"
- notifies :restart, resources( :service => "php-fpm" ), :delayed
+ notifies :reload, resources( :service => "php-fpm" ), :delayed
end

0 comments on commit ff839b0

Please sign in to comment.