Make it work with jessie, II

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

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index b45d6646c00f6c5b717bde0a334cbc245f98ceed..2522138345fe1e83e0325bbf781fdf7b548be8b6 100644 (file)
--- 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,
+               default  => root,
+       }
+
+       $gid = $::lsbdistcodename ? {
+               squeeze => adm,
+               default => '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'],
@@ -21,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',
@@ -30,14 +52,39 @@ class munin {
 
        @ferm::rule { 'dsa-munin-v4':
                description     => 'Allow munin from munin master',
-               rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }',
+               rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) ACCEPT; }',
                notarule        => true,
        }
 
        @ferm::rule { 'dsa-munin-v6':
                description     => 'Allow munin from munin master',
                domain          => 'ip6',
-               rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr (\$HOST_MUNIN_V6 \$HOST_NAGIOS_V6) ACCEPT; }',
+               rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V6 $HOST_NAGIOS_V6) ACCEPT; }',
                notarule        => true,
        }
+
+       @@munin::master-per-node {
+               $::fqdn:
+                       ipaddress   => $::ipaddress,
+                       munin_async => $::munin_async,
+                       ;
+       }
+
+       #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 == "testing" or $::lsbmajdistrelease >= 7 {
+               package { 'munin-async':
+                       ensure => installed
+               }
+               file { '/etc/ssh/userkeys/munin-async':
+                       source => 'puppet:///modules/munin/munin-async-authkeys',
+               }
+       }
 }