Restart nginx after an imagery_site is updated

diff --git a/cookbooks/imagery/.foodcritic b/cookbooks/imagery/.foodcritic
new file mode 100644 (file)
index 0000000..913f038
--- /dev/null
+++ b/cookbooks/imagery/.foodcritic
@@ -0,0 +1 @@
+~FC005

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 63e0ba91dcc01a32f48e130a6ab0f06d61ed81de..7adcba9205dd64d56ae1d1302eff98179faa593f 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -76,7 +76,6 @@ action :create do
     group "root"
     mode 0644
     variables new_resource.to_hash
     group "root"
     mode 0644
     variables new_resource.to_hash

-    # FIXME notifies :reload, "service[nginx]", :delayed

   end
 end
 
   end
 end
 


@@ -97,6 +96,5 @@ action :delete do
 
   file "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do
     action :delete
 
   file "/srv/imagery/nginx/#{site}/layer-#{name}.conf" do
     action :delete

-    # FIXME notifies :reload, "service[nginx]", :delayed

   end
 end
   end
 end

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index dfda20da16d5f1062907438e8da76b4616885c59..3edeb90385e03ef41807a17b188ce9057206d42b 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -31,6 +31,11 @@ action :create do
   nginx_site name do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{name}"
   nginx_site name do
     template "nginx_imagery.conf.erb"
     directory "/srv/imagery/#{name}"

+    restart_nginx false

     variables new_resource.to_hash
   end
 end
     variables new_resource.to_hash
   end
 end

+
+def after_created
+  notifies :restart, "service[nginx]"
+end

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index bdea43487ea6bcf30f8e97767c4c7f5da5417eca..e48e7b80d2ade6a24e69ca626bbd9c6412c66cc5 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -25,7 +25,8 @@ attribute :directory, :kind_of => String
 attribute :cookbook, :kind_of => String
 attribute :template, :kind_of => String, :required => true
 attribute :variables, :kind_of => Hash, :default => {}
 attribute :cookbook, :kind_of => String
 attribute :template, :kind_of => String, :required => true
 attribute :variables, :kind_of => Hash, :default => {}

+attribute :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => true

 
 def after_created
 
 def after_created

-  notifies :restart, "service[nginx]"
+  notifies :restart, "service[nginx]" if restart_nginx

 end
 end