Add lindsay

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

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 9684a29..c9b9853 100644 (file)
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -40,6 +40,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 +72,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',
                }
        }
 }