* add attribute node[:munin][:libdir]

* make sure directory exists
isaiahdw · Apr 14, 2011 · 3ad72e4 · 3ad72e4
1 parent f4123e0
commit 3ad72e4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/munin/attributes/default.rb b/munin/attributes/default.rb
@@ -1,7 +1,7 @@
-default[:munin] = {}
+set_unless[:munin]          = {}
+set_unless[:munin][:libdir] = '/vol/ganglia/munin/lib'
 
 set_unless[:sysop_email] = 'foo@example.org'
-
 # munin's db dir and log
 if attribute?(:scalarium_initial_setup)
   set[:scalarium_initial_setup][:bind_mounts][:mounts] = scalarium_initial_setup[:bind_mounts][:mounts].update({

diff --git a/munin/recipes/server.rb b/munin/recipes/server.rb
@@ -1,5 +1,13 @@
 package "munin"
 
+directory "#{node[:munin][:libdir]}" do
+  owner     'munin'
+  group     'munin'
+  mode      '0755'
+  action    :create
+  recursive true
+end
+
 if File.directory?("/etc/apache2") 
   include_recipe "munin::apache2"
 else

diff --git a/munin/templates/default/munin.erb b/munin/templates/default/munin.erb
@@ -1,5 +1,5 @@
 <% require 'resolv' -%>
-dbdir   /var/lib/munin
+dbdir   <%= node[:munin][:libdir] %>
 htmldir /var/www/munin
 logdir  /var/log/munin
 rundir  /var/run/munin