Avoid exception iterating a non-existent directory

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

diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb
index d6735ba8fa7dca06a4eb12e2ab80d01590fba06c..f1016927cdd0f09d37a2726c9a8ba2374daad975 100644 (file)
--- a/cookbooks/apache/resources/site.rb
+++ b/cookbooks/apache/resources/site.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: apache
+# Cookbook:: apache

 # Resource:: apache_site
 #
 # 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
 #
 #
 # 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,11 +17,65 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-actions :create, :enable, :disable, :delete

 default_action [:create, :enable]
 
 default_action [:create, :enable]
 

-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 => {}
+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 :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
+
+action :create do
+  declare_resource :template, available_name 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 => site_directory)
+  end
+end
+
+action :enable do
+  link enabled_name do
+    to available_name
+    owner "root"
+    group "root"
+  end
+end
+
+action :disable do
+  link enabled_name do
+    action :delete
+  end
+end
+
+action :delete do
+  file available_name do
+    action :delete
+  end
+end
+
+action_class do
+  def site_directory
+    new_resource.directory || "/var/www/#{new_resource.site}"
+  end
+
+  def available_name
+    "/etc/apache2/sites-available/#{new_resource.site}.conf"
+  end
+
+  def enabled_name
+    case new_resource.site
+    when "default"
+      "/etc/apache2/sites-enabled/000-default.conf"
+    else
+      "/etc/apache2/sites-enabled/#{new_resource.site}.conf"
+    end
+  end
+end
+
+def after_created
+  notifies :reload, "service[apache2]" if reload_apache
+end