diff --git a/definitions/munin_plugin.rb b/definitions/munin_plugin.rb index f878cef..e51915e 100644 --- a/definitions/munin_plugin.rb +++ b/definitions/munin_plugin.rb @@ -18,7 +18,7 @@ # -define :munin_plugin, :create_file => false, :enable => true do +define :munin_plugin, :create_file => false, :enable => true, :cookbook => 'munin' do include_recipe "munin::client" @@ -28,7 +28,7 @@ if params[:create_file] cookbook_file "#{plugin_dir}/#{params[:name]}" do - cookbook "munin" + cookbook params[:cookbook] source "plugins/#{params[:name]}" owner "root" group node['munin']['root']['group'] diff --git a/metadata.rb b/metadata.rb index 0635b6d..0d3bc82 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures munin" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "1.0.2" +version "1.0.4" depends "apache2", ">= 1.0.6" diff --git a/templates/default/munin.conf.erb b/templates/default/munin.conf.erb index cf4b072..19181ae 100644 --- a/templates/default/munin.conf.erb +++ b/templates/default/munin.conf.erb @@ -6,6 +6,10 @@ htmldir <%= @docroot %> logdir /var/log/munin rundir /var/run/munin +<% node['munin']['contacts'].each do |kind, command| %> +contact.<%= kind %>.contact <%= command %> +<% end %> + # Where to look for the HTML templates tmpldir <%= node['munin']['tmpldir'] %>