From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 27 Aug 2012 12:15:56 +0000 (+0000)
Subject: Explicitly set graph-strategy
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=08e9fd22853f958806191b8d6adc456aef35ea46;p=mirror%2Fdsa-puppet.git

Explicitly set graph-strategy
---

diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index 519e033a6..35e4bf0d4 100644
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,6 +3,19 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<% if hostname != "menotti" -%>
+
+dbdir   /var/lib/munin
+htmldir /var/cache/munin/www
+logdir  /var/log/munin
+rundir  /var/run/munin
+tmpldir /etc/munin/templates
+
+<% end -%>
+
+
+graph_strategy cgi
+
 includedir /etc/munin/munin-conf.d
 
 <% if hostname != "menotti" -%>
@@ -12,7 +25,6 @@ htmldir /var/cache/munin/www
 logdir  /var/log/munin
 rundir  /var/run/munin
 tmpldir /etc/munin/templates
-graph_strategy cgi
 
 <%= out = ''
     scope.lookupvar('site::localinfo').keys.sort.each do |node|