Update bundle

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

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index 7a18bf7f167008d5abee5ed38f7fb01dba9404a4..3913764daaa7bdf0e0593763b54120c582bfc2c9 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.


@@ -21,48 +21,37 @@ def whyrun_supported?
   true
 end
 
   true
 end
 

+use_inline_resources
+

 action :create do
 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 => site_directory)
     cookbook new_resource.cookbook
     source new_resource.template
     owner "root"
     group "root"
     mode 0644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)

-    if enabled?
-      notifies :reload, "service[apache2]"
-    end

   end
   end

-
-  new_resource.updated_by_last_action(t.updated_by_last_action?)

 end
 
 action :enable do
 end
 
 action :enable do

-  l = link enabled_name do
+  link enabled_name do

     to available_name
     owner "root"
     group "root"
     to available_name
     owner "root"
     group "root"

-    notifies :reload, "service[apache2]"

   end
   end

-
-  new_resource.updated_by_last_action(l.updated_by_last_action?)

 end
 
 action :disable do
 end
 
 action :disable do

-  l = link enabled_name do
+  link enabled_name do

     action :delete
     action :delete

-    notifies :reload, "service[apache2]"

   end
   end

-
-  new_resource.updated_by_last_action(l.updated_by_last_action?)

 end
 
 action :delete do
 end
 
 action :delete do

-  f = file available_name do
+  file available_name do

     action :delete
   end
     action :delete
   end

-
-  new_resource.updated_by_last_action(f.updated_by_last_action?)

 end
 
 def site_directory
 end
 
 def site_directory


@@ -70,18 +59,14 @@ def site_directory
 end
 
 def available_name
 end
 
 def available_name

-  "/etc/apache2/sites-available/#{new_resource.name}"
+  "/etc/apache2/sites-available/#{new_resource.name}.conf"

 end
 
 def enabled_name
   case new_resource.name
   when "default"
 end
 
 def enabled_name
   case new_resource.name
   when "default"

-    "/etc/apache2/sites-enabled/000-default"
+    "/etc/apache2/sites-enabled/000-default.conf"

   else
   else

-    "/etc/apache2/sites-enabled/#{new_resource.name}"
+    "/etc/apache2/sites-enabled/#{new_resource.name}.conf"

   end
 end
   end
 end

-
-def enabled?
-  ::File.exists?(enabled_name)
-end