Apache site files need to end with .conf on 14.04

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

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index b54c76a95015062fbd25cf85c0ab42465ea85cf9..86fecbfcf73376718984ac6c34a7d4395fe3c749 100644 (file)
--- 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -28,18 +28,16 @@ action :create do
     owner "root"
     group "root"
     mode 0644
     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)
+    notifies :reload, "service[apache2]" if enabled?

   end
 
   new_resource.updated_by_last_action(t.updated_by_last_action?)
 end
 
 action :enable do
   end
 
   new_resource.updated_by_last_action(t.updated_by_last_action?)
 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]"
     owner "root"
     group "root"
     notifies :reload, "service[apache2]"


@@ -49,7 +47,7 @@ action :enable do
 end
 
 action :disable do
 end
 
 action :disable do

-  l = link enabled_file do
+  l = link enabled_name do

     action :delete
     notifies :reload, "service[apache2]"
   end
     action :delete
     notifies :reload, "service[apache2]"
   end


@@ -65,16 +63,33 @@ action :delete do
   new_resource.updated_by_last_action(f.updated_by_last_action?)
 end
 
   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
 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
 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
   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
 
   end
 end