X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c1d216479f8ffd373f29c77e1e3c23c2bac168fe..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/nginx/resources/site.rb

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index e48e7b80d..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,
@@ -17,15 +17,41 @@
 # limitations under the License.
 #
 
-actions :create, :delete
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :directory, :kind_of => String
-attribute :cookbook, :kind_of => String
-attribute :template, :kind_of => String, :required => true
-attribute :variables, :kind_of => Hash, :default => {}
-attribute :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => 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 :variables, :kind_of => Hash, :default => {}
+property :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => true
+
+action :create do
+  declare_resource :template, conf_path do
+    cookbook new_resource.cookbook
+    source new_resource.template
+    owner "root"
+    group "root"
+    mode 0o644
+    variables new_resource.variables.merge(:name => new_resource.site, :directory => directory)
+  end
+end
+
+action :delete do
+  file conf_path do
+    action :delete
+  end
+end
+
+action_class do
+  def conf_path
+    "/etc/nginx/conf.d/#{new_resource.site}.conf"
+  end
+
+  def directory
+    new_resource.directory || "/var/www/#{new_resource.site}"
+  end
+end
 
 def after_created
   notifies :restart, "service[nginx]" if restart_nginx