Use declare_resource to avoid need for template_source wart

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

diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb
index f62f2ac57c08a2e1da3ba55d105bbfc08b1089b3..9a3c07c42d3e69b2ff285a17367b2917c2f2b846 100644 (file)
--- a/cookbooks/munin/resources/plugin.rb
+++ b/cookbooks/munin/resources/plugin.rb
@@ -40,7 +40,7 @@ action :create do
   if new_resource.conf # ~FC023
     munin_plugin_conf new_resource.plugin do
       cookbook new_resource.conf_cookbook
-      template_source new_resource.conf
+      template new_resource.conf
       variables new_resource.conf_variables
       restart_munin false
     end
@@ -68,10 +68,10 @@ action_class do
   def target_path
     if ::File.exist?(target)
       target
-    elsif ::File.exist?("/usr/local/share/munin/plugins/#{new_resource.target}")
-      "/usr/local/share/munin/plugins/#{new_resource.target}"
-    elsif ::File.exist?("/usr/share/munin/plugins/#{new_resource.target}")
-      "/usr/share/munin/plugins/#{new_resource.target}"
+    elsif ::File.exist?("/usr/local/share/munin/plugins/#{target}")
+      "/usr/local/share/munin/plugins/#{target}"
+    elsif ::File.exist?("/usr/share/munin/plugins/#{target}")
+      "/usr/share/munin/plugins/#{target}"
     end
   end