X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a57ccf4747c323d295f4445771113d769eefa0bc..b20599b6503be65674c3e420be6cca91b507ac0a:/cookbooks/apache/providers/site.rb?ds=sidebyside

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index 1b13a3d02..9c3303251 100644
--- a/cookbooks/apache/providers/site.rb
+++ b/cookbooks/apache/providers/site.rb
@@ -68,18 +68,31 @@ def site_directory
 end
 
 def available_name
-  "/etc/apache2/sites-available/#{new_resource.name}"
+  if node[:lsb][:release].to_f >= 14.04
+    "/etc/apache2/sites-available/#{new_resource.name}.conf"
+  else
+    "/etc/apache2/sites-available/#{new_resource.name}"
+  end
 end
 
 def enabled_name
-  case new_resource.name
-  when "default"
-    "/etc/apache2/sites-enabled/000-default"
+  if node[:lsb][:release].to_f >= 14.04
+    case new_resource.name
+    when "default"
+      "/etc/apache2/sites-enabled/000-default.conf"
+    else
+      "/etc/apache2/sites-enabled/#{new_resource.name}.conf"
+    end
   else
-    "/etc/apache2/sites-enabled/#{new_resource.name}"
+    case new_resource.name
+    when "default"
+      "/etc/apache2/sites-enabled/000-default"
+    else
+      "/etc/apache2/sites-enabled/#{new_resource.name}"
+    end
   end
 end
 
 def enabled?
-  ::File.exists?(enabled_name)
+  ::File.exist?(enabled_name)
 end