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

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

diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb
index 0ac19b0c795f9b64283754a900c4f74cb36a9d64..5bedbab440e451f8eceffa77a20f9aab42e92b59 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -19,7 +19,7 @@
 
 default_action [:create, :enable]
 
-property :conf, :kind_of => String, :name_attribute => true
+property :conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => String
 property :template, :kind_of => String, :required => true
 property :variables, :kind_of => Hash, :default => {}