X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..2d068c38b3f6b57528e3ca137f99c50c7c14762a:/cookbooks/apache/resources/site.rb diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb index d5b67b45a..e039e3ac5 100644 --- a/cookbooks/apache/resources/site.rb +++ b/cookbooks/apache/resources/site.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: apache +# Cookbook:: apache # Resource:: apache_site # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, 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,10 +19,10 @@ default_action [:create, :enable] -property :site, :kind_of => String, :name_attribute => true +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 +32,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