X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=8e4e7f2853e608ccb9ec111c4df378e5d88962a6;hb=8a2ead3c6f7a440c891891571a0203c7f9b254f7;hp=9578c6563b44573dc999486e180e596e82b9d531;hpb=68761bae2eab7c3995569a6890424a539065ac08;p=mirror%2Fdsa-puppet.git diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp index 9578c6563..8e4e7f285 100644 --- a/modules/munin/manifests/init.pp +++ b/modules/munin/manifests/init.pp @@ -68,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 { @@ -87,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', }