move munin-master crontab to dsa-puppet-stuff

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

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index 734c4c4..aa7934f 100644 (file)
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -11,7 +11,7 @@ class munin::master {
 
        ssl::service { 'munin.debian.org':
                notify  => Exec['service apache2 reload'],
-               tlsaport => 0,
+               key => true,
        }
        file { '/etc/munin/munin-conf.d':
                ensure  => directory,
@@ -22,9 +22,14 @@ class munin::master {
                source  => 'puppet:///files/empty/',
        }
 
-       Munin::Master-per-node<<| |>>
+       Munin::Master_per_node<<| |>>
 
        file { '/etc/cron.d/puppet-munin-cleanup':
+               ensure => absent;
+       }
+
+       concat::fragment { 'dsa-puppet-stuff--munin-master':
+               target => '/etc/cron.d/dsa-puppet-stuff',
                source => 'puppet:///modules/munin/master-cleanup-cron',
        }
 }