imagery: coct 2013 should not be default layer

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

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index 166aa4a4739adfced8ea204d0c4936ffc739d85c..252b5e8165f2377757cc40eb71e5a0b4b686a89c 100644 (file)
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -21,75 +21,59 @@ def whyrun_supported?
   true
 end
 
+use_inline_resources
+
 action :install do
-  if not installed?
+  unless installed?
     package package_name
-
-    updated = true
-  else
-    updated = false
   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
+      mode 0o644
       variables new_resource.variables
-      notifies :reload, "service[apache2]" if enabled?
     end
-
-    updated = updated || t.updated_by_last_action?
   end
-
-  new_resource.updated_by_last_action(updated)
 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
+  execute "a2enmod-#{new_resource.name}" do
+    command "a2enmod #{new_resource.name}"
+    user "root"
+    group "root"
+    not_if { ::File.exist?(enabled_name("load")) }
+  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
-  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
-  if installed?
-    package package_name do
-      action :remove
-    end
-
-    new_resource.updated_by_last_action(true)
+  package package_name do
+    action :remove
   end
 end
 
@@ -108,7 +92,3 @@ end
 def installed?
   ::File.exist?(available_name("load"))
 end
-
-def enabled?
-  ::File.exist?(enabled_name("load"))
-end