civi version bump

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

diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb
index f62f2ac57c08a2e1da3ba55d105bbfc08b1089b3..10c149436b7c79d96b59a738eeb39e1d22c51326 100644 (file)
--- a/cookbooks/munin/resources/plugin.rb
+++ b/cookbooks/munin/resources/plugin.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: munin
+# Cookbook:: munin

 # Provider:: munin_plugin
 #
 # 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 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
 property :target, :kind_of => String
 property :conf, :kind_of => String
 property :conf_cookbook, :kind_of => String


@@ -37,10 +39,10 @@ action :create do
     to target_path
   end
 
     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
     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
       variables new_resource.conf_variables
       restart_munin false
     end


@@ -52,7 +54,7 @@ action :delete do
     action :delete
   end
 
     action :delete
   end
 

-  if new_resource.conf # ~FC023
+  if new_resource.conf

     munin_plugin_conf new_resource.plugin do
       action :delete
       restart_munin false
     munin_plugin_conf new_resource.plugin do
       action :delete
       restart_munin false


@@ -68,10 +70,10 @@ action_class do
   def target_path
     if ::File.exist?(target)
       target
   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
 
     end
   end
 


@@ -81,5 +83,5 @@ action_class do
 end
 
 def after_created
 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
 end