From fe3e73cc0b30c8cd48584d0e97d4da7c06110308 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Nov 2013 10:56:16 +0000 Subject: [PATCH] Make sure @directory is set properly in apache site templates --- cookbooks/apache/providers/site.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb index e15646456..7a18bf7f1 100644 --- 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 @@ -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 -- 2.43.2