Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[COOK-1143] support pulling plugin files from external cookbooks #2

Merged
merged 2 commits into from

2 participants

@josephholsten

No description provided.

@jtimberman jtimberman merged commit d59dc3e into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
4 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']
View
2  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"
View
4 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'] %>
Something went wrong with that request. Please try again.