X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=19b563f4c2a8216bd43f852b02fc9fd1942b1341;hb=4a10edf91499158603a7735953a7dc43f9585e6d;hp=8730f53f36349764cf8f20dfc578b756140de2db;hpb=4a87e86ffd4eb2ba87e1bbc1582ed077267cb9cf;p=mirror%2Fdsa-puppet.git diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp index 8730f53f3..19b563f4c 100644 --- a/modules/munin/manifests/init.pp +++ b/modules/munin/manifests/init.pp @@ -11,14 +11,12 @@ class munin { $owner = $::lsbdistcodename ? { squeeze => munin, - wheezy => root, - undef => munin, + default => root, } $gid = $::lsbdistcodename ? { squeeze => adm, - wheezy => 'www-data', - undef => adm, + default => 'www-data', } file { '/var/log/munin': @@ -40,6 +38,11 @@ class munin { notify => Service['munin-node'], } + file { '/etc/logrotate.d/munin-node': + source => 'puppet:///modules/munin/logrotate', + require => Package['munin-node'], + } + file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]: source => 'puppet:///modules/munin/df-wrap', mode => '0555',