X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fe3e73cc0b30c8cd48584d0e97d4da7c06110308..ff044920428608b2c04507ad52d6ab52c9d6555f:/cookbooks/apache/providers/site.rb

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index 7a18bf7f1..9c3303251 100644
--- a/cookbooks/apache/providers/site.rb
+++ b/cookbooks/apache/providers/site.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: postgresql
-# Provider:: postgresql_database
+# Cookbook Name:: apache
+# Provider:: apache_site
 #
-# Copyright 2012, 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.
@@ -29,9 +29,7 @@ action :create do
     group "root"
     mode 0644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)
-    if enabled?
-      notifies :reload, "service[apache2]"
-    end
+    notifies :reload, "service[apache2]" if enabled?
   end
 
   new_resource.updated_by_last_action(t.updated_by_last_action?)
@@ -70,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