Use a connection URI for postgres monitoring

[chef.git] / cookbooks / nginx / resources / site.rb

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 8ac81adcff402ca4401c815646b7a90cc5a5cec5..45422434a9274b66d0b69a501361cc8c153a8f93 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -22,9 +22,8 @@ default_action :create
 property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :variables, :kind_of => Hash, :default => {}

-property :reload_nginx, :kind_of => [TrueClass, FalseClass], :default => true

 
 action :create do
   declare_resource :template, conf_path do
 
 action :create do
   declare_resource :template, conf_path do


@@ -32,7 +31,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
     source new_resource.template
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables new_resource.variables.merge(:name => new_resource.site, :directory => directory)
   end
 end
     variables new_resource.variables.merge(:name => new_resource.site, :directory => directory)
   end
 end


@@ -40,6 +39,7 @@ end
 action :delete do
   file conf_path do
     action :delete
 action :delete do
   file conf_path do
     action :delete

+    notifies :reload, "service[nginx]"

   end
 end
 
   end
 end
 


@@ -54,5 +54,5 @@ action_class do
 end
 
 def after_created
 end
 
 def after_created

-  notifies :reload, "service[nginx]" if reload_nginx
+  notifies :reload, "service[nginx]"

 end
 end