Fix some chef deprecation warnings

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

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index 166aa4a4739adfced8ea204d0c4936ffc739d85c..e824a03433e5d0e986d5be4fc82b3119165b31d9 100644 (file)
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -21,75 +21,52 @@ def whyrun_supported?
   true
 end
 
   true
 end
 

+use_inline_resources
+

 action :install do
 action :install do

-  if not installed?
+  unless installed?

     package package_name
     package package_name

-
-    updated = true
-  else
-    updated = false

   end
 
   end
 

-  if new_resource.conf
-    t = template available_name("conf") do
+  if new_resource.conf # ~FC023
+    template available_name("conf") do

       source new_resource.conf
       owner "root"
       group "root"
       mode 0644
       variables new_resource.variables
       source new_resource.conf
       owner "root"
       group "root"
       mode 0644
       variables new_resource.variables

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

     end
     end

-
-    updated = updated || t.updated_by_last_action?

   end
   end

-
-  new_resource.updated_by_last_action(updated)

 end
 
 action :enable do
 end
 
 action :enable do

-  if not enabled?
-    link enabled_name("load") do
-      to available_name("load")
-      owner "root"
-      group "root"
-      notifies :restart, "service[apache2]"
-    end
-
-    link enabled_name("conf") do
-      to available_name("conf")
-      owner "root"
-      group "root"
-      notifies :reload, "service[apache2]"
-      only_if { ::File.exist?(available_name("conf")) }
-    end
+  link enabled_name("load") do
+    to available_name("load")
+    owner "root"
+    group "root"
+  end

 
 

-    new_resource.updated_by_last_action(true)
+  link enabled_name("conf") do
+    to available_name("conf")
+    owner "root"
+    group "root"
+    only_if { ::File.exist?(available_name("conf")) }

   end
 end
 
 action :disable do
   end
 end
 
 action :disable do

-  if enabled?
-    link enabled_name("load") do
-      action :delete
-      notifies :restart, "service[apache2]"
-    end
-
-    link enabled_name("conf") do
-      action :delete
-      notifies :reload, "service[apache2]"
-    end
+  link enabled_name("load") do
+    action :delete
+  end

 
 

-    new_resource.updated_by_last_action(true)
+  link enabled_name("conf") do
+    action :delete

   end
 end
 
 action :delete do
   end
 end
 
 action :delete do

-  if installed?
-    package package_name do
-      action :remove
-    end
-
-    new_resource.updated_by_last_action(true)
+  package package_name do
+    action :remove

   end
 end
 
   end
 end
 


@@ -108,7 +85,3 @@ end
 def installed?
   ::File.exist?(available_name("load"))
 end
 def installed?
   ::File.exist?(available_name("load"))
 end

-
-def enabled?
-  ::File.exist?(enabled_name("load"))
-end