Add OOB addresses for spike-01 and spike-02

[chef.git] / cookbooks / nginx / resources / site.rb

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 8a09e7bdfe29313f53d073314dbab42e1131da87..b1a4b5970ddbcc01e4845511636aee257930db88 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: nginx
+# Cookbook:: nginx

 # Resource:: nginx_site
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,22 +17,23 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 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 :directory, :kind_of => String
 property :cookbook, :kind_of => String

-property :template_source, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :variables, :kind_of => Hash, :default => {}

-property :restart_nginx, :kind_of => [TrueClass, FalseClass], :default => true

 
 action :create do
 
 action :create do

-  template conf_path do
+  declare_resource :template, conf_path do

     cookbook new_resource.cookbook
     cookbook new_resource.cookbook

-    source new_resource.template_source
+    source new_resource.template

     owner "root"
     group "root"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables new_resource.variables.merge(:name => new_resource.site, :directory => directory)
   end
 end
     variables new_resource.variables.merge(:name => new_resource.site, :directory => directory)
   end
 end


@@ -40,6 +41,7 @@ end
 action :delete do
   file conf_path do
     action :delete
 action :delete do
   file conf_path do
     action :delete

+    notifies :reload, "service[nginx]"

   end
 end
 
   end
 end
 


@@ -54,5 +56,5 @@ action_class do
 end
 
 def after_created
 end
 
 def after_created

-  notifies :restart, "service[nginx]" if restart_nginx
+  notifies :reload, "service[nginx]"

 end
 end