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 8e70701c85d4b133b7361a1f99025b6886ed6e1b..5bedbab440e451f8eceffa77a20f9aab42e92b59 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: apache
+# Cookbook:: apache
 # Resource:: apache_conf
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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 => {}