X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=91657e08a3abf67de15da4132d3a870b87cc3bd2;hb=2cdec8fac4eb9511d0e7d1a01523066cbd9d13f6;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..91657e08a 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -55,38 +55,37 @@ class munin {
 		notify  => Service['munin-node'],
 	}
 
-	@ferm::rule { 'dsa-munin-v4':
+	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; }',
 		notarule        => true,
 	}
 
-	@ferm::rule { 'dsa-munin-v6':
+	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; }',
 		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 {
-	#	file { '/etc/ssh/userkeys/munin-async':
-	#		source => 'puppet:///modules/munin/munin-async-authkeys',
-	#	}
-	#} else {
-	#	file { '/etc/ssh/userkeys/munin-async':
-	#		ensure => 'absent',
-	#	}
-	#}
 	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',
 	}