Make sure @directory is set properly in apache site templates

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

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index 145d35598cb1c662a1aca0427cd195d36d289401..7a18bf7f167008d5abee5ed38f7fb01dba9404a4 100644 (file)
--- a/cookbooks/apache/providers/site.rb
+++ b/cookbooks/apache/providers/site.rb
@@ -28,7 +28,7 @@ action :create do
     owner "root"
     group "root"
     mode 0644
-    variables new_resource.variables.merge(:name => new_resource.name, :directory => new_resource.directory)
+    variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)
     if enabled?
       notifies :reload, "service[apache2]"
     end
@@ -38,8 +38,8 @@ action :create do
 end
 
 action :enable do
-  l = link enabled_file do
-    to available_file
+  l = link enabled_name do
+    to available_name
     owner "root"
     group "root"
     notifies :reload, "service[apache2]"
@@ -49,7 +49,7 @@ action :enable do
 end
 
 action :disable do
-  l = link enabled_file do
+  l = link enabled_name do
     action :delete
     notifies :reload, "service[apache2]"
   end
@@ -65,6 +65,10 @@ action :delete do
   new_resource.updated_by_last_action(f.updated_by_last_action?)
 end
 
+def site_directory
+  new_resource.directory || "/var/www/#{new_resource.name}"
+end
+
 def available_name
   "/etc/apache2/sites-available/#{new_resource.name}"
 end
@@ -79,5 +83,5 @@ def enabled_name
 end
 
 def enabled?
-  File.exists?(enabled_name)
+  ::File.exists?(enabled_name)
 end