X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=4f541bfcda2da717593467c39a22990a730033ff;hb=3a63826fbd692815168b7d2e67d0ff978069fbb3;hp=5ea2762b0d15c9d3b0e2ff357e3c1a94d1a2b293;hpb=bb128bfc7e9060c7b3cb71d133e464f20a067dc1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 5ea2762b0..4f541bfcd 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -55,33 +55,21 @@ 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:
-			ipaddress   => $::ipaddress,
-			munin_async => $::munin_async,
-	}
+	@@munin::master_per_node { $::fqdn: }
 
-	#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
 	}
@@ -89,7 +77,7 @@ class munin {
 		ensure  => running,
 		require => Package['munin-async'],
 	}
-	systemd::override { 'munin-async':
+	dsa_systemd::override { 'munin-async':
 		content  => @("EOF"),
 			[Service]
 			RestartSec=10