remove duplicate /etc/ssh/userkeys/dak, add srv/ftp.../home

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

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 37b3030..8e4e7f2 100644 (file)
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -41,8 +41,9 @@ class munin {
        }
 
        file { '/etc/munin/plugins/df_abs':
-               ensure  => link,
-               target  => '/usr/share/munin/plugins/df_abs',
+               ensure  => file,
+               source => 'puppet:///modules/munin/df-wrap',
+               mode    => '0555',
                require => Package['munin-node'],
                notify  => Service['munin-node'],
        }
@@ -67,11 +68,9 @@ class munin {
                notarule        => true,
        }
 
-       @@munin::master-per-node {
-               $::fqdn:
+       @@munin::master_per_node { $::fqdn:
                        ipaddress   => $::ipaddress,
                        munin_async => $::munin_async,
-                       ;
        }
 
        #if $::munin_async and str2bool($::munin_async) == true {
@@ -86,6 +85,16 @@ class munin {
        package { 'munin-async':
                ensure => installed
        }
+       service { 'munin-async':
+               ensure  => running,
+               require => Package['munin-async'],
+       }
+       dsa_systemd::override { 'munin-async':
+               content  => @("EOF"),
+                       [Service]
+                       RestartSec=10
+                       | EOF
+       }
        file { '/etc/ssh/userkeys/munin-async':
                source => 'puppet:///modules/munin/munin-async-authkeys',
        }