X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..68a4578df5a1ba3b1cd0a48020a032411c5b804d:/cookbooks/munin/resources/plugin.rb

diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb
index 01bf9167e..10c149436 100644
--- a/cookbooks/munin/resources/plugin.rb
+++ b/cookbooks/munin/resources/plugin.rb
@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
-property :plugin, :kind_of => String, :name_attribute => true
+property :plugin, :kind_of => String, :name_property => true
 property :target, :kind_of => String
 property :conf, :kind_of => String
 property :conf_cookbook, :kind_of => String
@@ -37,7 +39,7 @@ action :create do
     to target_path
   end
 
-  if new_resource.conf # ~FC023
+  if new_resource.conf
     munin_plugin_conf new_resource.plugin do
       cookbook new_resource.conf_cookbook
       template new_resource.conf
@@ -52,7 +54,7 @@ action :delete do
     action :delete
   end
 
-  if new_resource.conf # ~FC023
+  if new_resource.conf
     munin_plugin_conf new_resource.plugin do
       action :delete
       restart_munin false
@@ -81,5 +83,5 @@ action_class do
 end
 
 def after_created
-  notifies :restart, "service[munin-node]" if restart_munin && node[:recipes].include?("munin")
+  notifies :restart, "service[munin-node]" if restart_munin
 end