soler: decomission rt#5890

[dsa-puppet.git] / modules / munin / manifests / init.pp

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 9684a2944424c25ab09ebcf5734217c0e0cf1a73..19b563f4c2a8216bd43f852b02fc9fd1942b1341 100644 (file)
--- 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',
@@ -67,13 +70,21 @@ class munin {
                        ;
        }
 
-       if $::munin_async and str2bool($::munin_async) == true {
-               file { '/etc/ssh/userkeys/munin-async':
-                       source => 'puppet:///modules/munin/munin-async-authkeys',
+       #if $::munin_async and str2bool($::munin_async) == true {
+       #       file { '/etc/ssh/userkeys/munin-async':
+       #               source => 'puppet:///modules/munin/munin-async-authkeys',
+       #       }
+       #} else {
+       #       file { '/etc/ssh/userkeys/munin-async':
+       #               ensure => 'absent',
+       #       }
+       #}
+       if $::lsbmajdistrelease >= 7 {
+               package { 'munin-async':
+                       ensure => installed
                }
-       } else {
                file { '/etc/ssh/userkeys/munin-async':
-                       ensure => 'absent',
+                       source => 'puppet:///modules/munin/munin-async-authkeys',
                }
        }
 }