X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=b4a5398ba91182df01ec855fcf5f3e406346c97f;hb=de111aab71629ae8a4a4658366c777997639afbd;hp=37b30303e715fc66457404bff77c12067a57d043;hpb=199cc1838cf43726fce8abda0d32a1b9e47d3620;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 37b30303e..b4a5398ba 100644
--- 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 {