X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=91657e08a3abf67de15da4132d3a870b87cc3bd2;hb=5649a4242e4cea08fa81bafc980eed5cdb7e3607;hp=be41ad375e010190821ff64fc8b37e7729b3f0e0;hpb=a4a85846f684e9a78f711071b681276c960920ba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index be41ad375..91657e08a 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -55,13 +55,13 @@ 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; }',
@@ -73,23 +73,14 @@ class munin {
 			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-node'],
+		require => Package['munin-async'],
 	}
-	systemd::override { 'munin-async':
+	dsa_systemd::override { 'munin-async':
 		content  => @("EOF"),
 			[Service]
 			RestartSec=10