Use pyproj to project coordinates

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

diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb
index 1fcff4c057a8ba744dd28266acf64447da83c2fe..10c149436b7c79d96b59a738eeb39e1d22c51326 100644 (file)
--- a/cookbooks/munin/resources/plugin.rb
+++ b/cookbooks/munin/resources/plugin.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: munin
+# Cookbook:: munin
 # Provider:: munin_plugin
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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