X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e5f294d3dc676675b2803915571c28337468c3b3..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/nginx/resources/site.rb?ds=sidebyside diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb index 8a09e7bdf..3c47d3091 100644 --- a/cookbooks/nginx/resources/site.rb +++ b/cookbooks/nginx/resources/site.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: nginx +# Cookbook:: nginx # Resource:: nginx_site # -# Copyright 2015, OpenStreetMap Foundation +# Copyright:: 2015, 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,17 +19,17 @@ default_action :create -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_source, :kind_of => String, :required => true +property :template, :kind_of => String, :required => true property :variables, :kind_of => Hash, :default => {} property :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => true action :create do - template conf_path do + declare_resource :template, conf_path do cookbook new_resource.cookbook - source new_resource.template_source + source new_resource.template owner "root" group "root" mode 0o644