X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/741593ee2bf203c9261f604d094e3d8e621698a8..edbdeaae6b0020aef037fb55d2b24425be67dadb:/cookbooks/nginx/resources/site.rb diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb index 3c47d3091..45422434a 100644 --- 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 :template, :kind_of => String, :required => true +property :template, :kind_of => String, :required => [:create] property :variables, :kind_of => Hash, :default => {} -property :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => true action :create do declare_resource :template, conf_path do @@ -32,7 +31,7 @@ action :create do 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 @@ -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 :restart, "service[nginx]" if restart_nginx + notifies :reload, "service[nginx]" end