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

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index b54c76a95..a8c903449 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.
@@ -21,63 +21,65 @@ def whyrun_supported?
   true
 end
 
+use_inline_resources
+
 action :create do
-  t = template available_name do
+  template available_name do
     cookbook new_resource.cookbook
     source new_resource.template
     owner "root"
     group "root"
     mode 0644
-    variables new_resource.variables.merge(:name => new_resource.name, :directory => new_resource.directory)
-    if enabled?
-      notifies :reload, "service[apache2]"
-    end
+    variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)
   end
-
-  new_resource.updated_by_last_action(t.updated_by_last_action?)
 end
 
 action :enable do
-  l = link enabled_file do
-    to available_file
+  link enabled_name do
+    to available_name
     owner "root"
     group "root"
-    notifies :reload, "service[apache2]"
   end
-
-  new_resource.updated_by_last_action(l.updated_by_last_action?)
 end
 
 action :disable do
-  l = link enabled_file do
+  link enabled_name do
     action :delete
-    notifies :reload, "service[apache2]"
   end
-
-  new_resource.updated_by_last_action(l.updated_by_last_action?)
 end
 
 action :delete do
-  f = file available_name do
+  file available_name do
     action :delete
   end
+end
 
-  new_resource.updated_by_last_action(f.updated_by_last_action?)
+def site_directory
+  new_resource.directory || "/var/www/#{new_resource.name}"
 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)
-end