X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e5f294d3dc676675b2803915571c28337468c3b3..35171e1e6bceb46b7d575de5dda768eb97f4bd49:/cookbooks/munin/resources/plugin.rb diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb index f62f2ac57..1fcff4c05 100644 --- a/cookbooks/munin/resources/plugin.rb +++ b/cookbooks/munin/resources/plugin.rb @@ -8,7 +8,7 @@ # 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, @@ -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