nginx: cleanup reload triggers

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 961216f9d8b1a5e27404560003578e1d8991e4af..7fd2102843200accfe82c56c5c0c3a9b0e06df5e 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -82,7 +82,6 @@ end
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"
-  reload_nginx false
 end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index f8d3b1aa1c8ce758eda7a2c8d50c092517a43bc7..394142af75e58118164b25ebbd21a5ab56e7c739 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -115,5 +115,4 @@ end
 def after_created
   notifies :create, "imagery_site[#{site}]"
   notifies :reload, "service[nginx]"
-  # notifies :restart, "service[mapserv-fcgi-#{site}]"
 end

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index dc819ebf99fd6c190af551bca00bd962664bb105..8aaef45ee8662e52b34dcce74d8a909c027a0f41 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -137,7 +137,6 @@ action :create do
   nginx_site new_resource.site do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{new_resource.site}"
-    reload_nginx false
     variables new_resource.to_hash
   end
 end

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 8ac81adcff402ca4401c815646b7a90cc5a5cec5..8a50ae04209dade3af3821444ad546cc0495eb4d 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -24,7 +24,6 @@ property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :template, :kind_of => String, :required => true
 property :variables, :kind_of => Hash, :default => {}
-property :reload_nginx, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   declare_resource :template, conf_path do
@@ -40,6 +39,7 @@ end
 action :delete do
   file conf_path do
     action :delete
+    notifies :reload, "service[nginx]"
   end
 end
 
@@ -54,5 +54,5 @@ action_class do
 end
 
 def after_created
-  notifies :reload, "service[nginx]" if reload_nginx
+  notifies :reload, "service[nginx]"
 end