X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b07ff42db7a14a660ce257352804efc2adf323ea..974d2ff3a3ff7f13d26667972fb2ab802f76e826:/cookbooks/apache/resources/conf.rb?ds=sidebyside diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb index 2f6eff5cb..12daf87ab 100644 --- a/cookbooks/apache/resources/conf.rb +++ b/cookbooks/apache/resources/conf.rb @@ -1,14 +1,14 @@ # -# 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. # 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, @@ -19,9 +19,9 @@ 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 :template, :kind_of => String, :required => [:create] property :variables, :kind_of => Hash, :default => {} property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true @@ -48,7 +48,7 @@ action_class do source new_resource.template owner "root" group "root" - mode 0o644 + mode "644" variables new_resource.variables end end