X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fcheck.pp;h=0ed10ea574d20ee983f0d68196e9087163978b67;hb=694793a4317a94b7dc1483f4a52d4b1868224ed6;hp=7e4a5c656e4d05efc9ec985d3c943d7d1d62e12d;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/check.pp b/modules/munin/manifests/check.pp
index 7e4a5c656..0ed10ea57 100644
--- a/modules/munin/manifests/check.pp
+++ b/modules/munin/manifests/check.pp
@@ -1,22 +1,21 @@
-define munin::check($ensure = present, $script = undef) {
+# enable (or disable) a munin check
+# @param ensure check enabled/disabled
+# @param script check to synclink
+define munin::check(
+  Enum['present','absent'] $ensure = 'present',
+  String $script = $name
+) {
+  include munin
 
-	if $script {
-		$link = $script
-	} else {
-		$link = $name
-	}
+  $link_target = $ensure ? {
+    present => link,
+    absent  => absent,
+  }
 
-	$link_target = $ensure ? {
-		present => "/usr/share/munin/plugins/${link}"
-		absent  => absent,
-		default => err ( "Unknown ensure value: '$ensure'" ),
-	}
-
-	file { "/etc/munin/plugins/${name}":
-		ensure  => $link_target,
-		require => Package['munin-node'],
-		notify  => Service['munin-node'],
-	}
+  file { "/etc/munin/plugins/${name}":
+    ensure  => $link_target,
+    target  => "/usr/share/munin/plugins/${script}",
+    require => Package['munin-node'],
+    notify  => Service['munin-node'],
+  }
 }
-
-