From: Stephen Gran <steve@lobefin.net>
Date: Tue, 5 Jun 2012 15:49:15 +0000 (+0100)
Subject: Make logrotate shut up
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=03759fbbe4779edc3de7cafe0a6439b944dc7799;p=mirror%2Fdsa-puppet.git

Make logrotate shut up

This is the fix that the debian packages will take
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index ee50bd0a3..2bbb7d454 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -9,6 +9,23 @@ class munin {
 		require => Package['munin-node'],
 	}
 
+	$owner = lsbdistcodename ? {
+		squeeze => munin,
+		wheezy  => root
+	}
+
+	$gid = lsbdistcodename ? {
+		squeeze => adm,
+		wheezy  => 'www-data',
+	}
+
+	file { '/var/log/munin':
+		ensure => directory,
+		owner  => $owner,
+		group  => $gid,
+		mode   => '0755',
+	}
+
 	file { '/etc/munin/munin-node.conf':
 		content => template('munin/munin-node.conf.erb'),
 		require => Package['munin-node'],