use distro-provided php-db instead of manually installed one

[chef.git] / cookbooks / munin / providers / plugin.rb

diff --git a/cookbooks/munin/providers/plugin.rb b/cookbooks/munin/providers/plugin.rb
index c058524b91a4a9303a6bdbc4971cf51b23a44d0e..bcbb07746f85572e4639730950f8ed838754d5f3 100644 (file)
--- a/cookbooks/munin/providers/plugin.rb
+++ b/cookbooks/munin/providers/plugin.rb
@@ -21,50 +21,40 @@ def whyrun_supported?
   true
 end
 
   true
 end
 

+use_inline_resources
+

 action :create do
   link_action = case target_path
                 when nil then :delete
                 else :create
                 end
 
 action :create do
   link_action = case target_path
                 when nil then :delete
                 else :create
                 end
 

-  l = link plugin_path do
+  link plugin_path do

     action link_action
     to target_path
     action link_action
     to target_path

-    notifies :restart, "service[munin-node]"

   end
 
   end
 

-  updated = l.updated_by_last_action?
-
-  if new_resource.conf
-    c = munin_plugin_conf new_resource.name do
+  if new_resource.conf # ~FC023
+    munin_plugin_conf new_resource.name do

       cookbook new_resource.conf_cookbook
       template new_resource.conf
       variables new_resource.conf_variables
       cookbook new_resource.conf_cookbook
       template new_resource.conf
       variables new_resource.conf_variables

+      restart_munin false

     end
     end

-
-    updated = updated || c.updated_by_last_action?

   end
   end

-
-  new_resource.updated_by_last_action(updated)

 end
 
 action :delete do
 end
 
 action :delete do

-  l = link plugin_path do
+  link plugin_path do

     action :delete
     action :delete

-    notifies :restart, "service[munin-node]"

   end
 
   end
 

-  updated = l.updated_by_last_action?
-
-  if new_resource.conf
-    c = munin_plugin_conf new_resource.name do
+  if new_resource.conf # ~FC023
+    munin_plugin_conf new_resource.name do

       action :delete
       action :delete

+      restart_munin false

     end
     end

-
-    updated = updated || c.updated_by_last_action?

   end
   end

-
-  new_resource.updated_by_last_action(updated)

 end
 
 def plugin_path
 end
 
 def plugin_path


@@ -79,8 +69,6 @@ def target_path
     "/usr/local/share/munin/plugins/#{target}"
   when ::File.exist?("/usr/share/munin/plugins/#{target}")
     "/usr/share/munin/plugins/#{target}"
     "/usr/local/share/munin/plugins/#{target}"
   when ::File.exist?("/usr/share/munin/plugins/#{target}")
     "/usr/share/munin/plugins/#{target}"

-  else
-    nil

   end
 end
 
   end
 end