X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b07ff42db7a14a660ce257352804efc2adf323ea..218b774fc17db5e043c567fc5a0bc469a48bbcd8:/cookbooks/apache/resources/site.rb?ds=inline diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb index 8aa9c78a1..598f841ff 100644 --- a/cookbooks/apache/resources/site.rb +++ b/cookbooks/apache/resources/site.rb @@ -1,14 +1,14 @@ # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,12 +17,14 @@ # limitations under the License. # +unified_mode true + 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 +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