Skip to content
Browse files

Move service related into 'php-fpm::service'.

Remove ':nothing' since it's the default!
  • Loading branch information...
1 parent 0463e4e commit 0a09fa00934f84760d6d2d0a6f55bf1c9c4a1ad2 @till committed Sep 24, 2012
Showing with 13 additions and 16 deletions.
  1. +0 −14 php-fpm/recipes/configure.rb
  2. +13 −2 php-fpm/recipes/service.rb
View
14 php-fpm/recipes/configure.rb
@@ -94,20 +94,6 @@
end
end
-template "/etc/default/php-fpm" do
- source "default.erb"
- mode "0644"
- notifies :restart, resources(:service => "php-fpm"), :delayed
-end
-
-template "/etc/init.d/php-fpm" do
- mode "0755"
- source "init.d.php-fpm.erb"
- owner node["php-fpm"][:user]
- group node["php-fpm"][:group]
- notifies :restart, resources(:service => "php-fpm"), :delayed
-end
-
template "/etc/logrotate.d/php" do
source "logrotate.erb"
mode "0644"
View
15 php-fpm/recipes/service.rb
@@ -1,5 +1,16 @@
+template "/etc/default/php-fpm" do
+ source "default.erb"
+ mode "0644"
+end
+
+template "/etc/init.d/php-fpm" do
+ mode "0755"
+ source "init.d.php-fpm.erb"
+ owner node["php-fpm"][:user]
+ group node["php-fpm"][:group]
+end
+
service "php-fpm" do
service_name "php-fpm"
- supports [:start, :status, :restart]
- action :nothing
+ supports [:start, :status, :restart]
end

0 comments on commit 0a09fa0

Please sign in to comment.
Something went wrong with that request. Please try again.