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

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

diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb
index f1016927cdd0f09d37a2726c9a8ba2374daad975..598f841ff86e131abea1546c3370e38b56577342 100644 (file)
--- a/cookbooks/apache/resources/site.rb
+++ b/cookbooks/apache/resources/site.rb
@@ -17,12 +17,14 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action [:create, :enable]
 
 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 :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
@@ -32,7 +34,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 => site_directory)
   end
 end