Merge duplicate hash entries

[chef.git] / cookbooks / nginx / definitions / nginx_site.rb

diff --git a/cookbooks/nginx/definitions/nginx_site.rb b/cookbooks/nginx/definitions/nginx_site.rb
index 528527b07b17cdd8eec8543284087e39a206b500..f6e1f3a4d820e4f647d740c7977771a64b5ed19c 100644 (file)
--- a/cookbooks/nginx/definitions/nginx_site.rb
+++ b/cookbooks/nginx/definitions/nginx_site.rb
@@ -30,11 +30,9 @@ define :nginx_site, :action => [ :create ], :variables => {} do
       group "root"
       mode 0644
       variables params[:variables].merge(:name => name, :directory => directory)
-      notifies :reload, "service[nginx]"
+      notifies :restart, "service[nginx]"
     end
-  end
-
-  if site_action.include?(:delete)
+  elsif site_action.include?(:delete)
     file "/etc/nginx/conf.d/#{name}.conf" do
       action :delete
       notifies :restart, "service[nginx]"