Merge remote-tracking branch 'github/pull/378'

[chef.git] / cookbooks / apache / resources / conf.rb

diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb
index 5bedbab440e451f8eceffa77a20f9aab42e92b59..12daf87ab48ef39d5bf0e1c84b09da69a07c0f9f 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -21,7 +21,7 @@ default_action [:create, :enable]
 
 property :conf, :kind_of => String, :name_property => true
 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 :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
@@ -48,7 +48,7 @@ action_class do
       source new_resource.template
       owner "root"
       group "root"
-      mode 0o644
+      mode "644"
       variables new_resource.variables
     end
   end