X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Fconf.pp;h=ad5026c2fa38e83869d66fd14a115b030cac354d;hb=HEAD;hp=ad557abe2ec5e1aae6787c75adda86625c3d9ff9;hpb=b7ae0d3568c36ee2ec66ff288ba3b89b3ca96ed6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/conf.pp b/modules/munin/manifests/conf.pp
index ad557abe2..ad5026c2f 100644
--- a/modules/munin/manifests/conf.pp
+++ b/modules/munin/manifests/conf.pp
@@ -1,34 +1,19 @@
+# a conf.d snippet
+# @param ensure check enabled/disabled
+# @param content content to put into plugon-conf.d/<name>
+# @param source file to put into plugon-conf.d/<name>
 define munin::conf (
-	$ensure=present,
-	$content='',
-	$source=''
+  Enum['present','absent'] $ensure = 'present',
+  Optional[String] $content = undef,
+  Optional[String] $source = undef,
 ) {
+  include munin
 
-	include munin
-
-	case $ensure {
-		present: {
-			if ! ($source or $content) {
-				fail ( "No configuration found for ${name}" )
-			}
-		}
-		absent:  {}
-		default: { fail ( "Unknown ensure value: '$ensure'" ) }
-	}
-
-	if $source {
-		file { "/etc/munin/plugin-conf.d/${name}":
-			ensure  => $ensure,
-			source  => $source,
-			require => Package['munin-node'],
-			notify  => Service['munin-node'],
-		}
-	} elsif $content {
-		file { "/etc/munin/plugin-conf.d/${name}":
-			ensure  => $ensure,
-			content => $content,
-			require => Package['munin-node'],
-			notify  => Service['munin-node'],
-		}
-	}
+  file { "/etc/munin/plugin-conf.d/${name}":
+    ensure  => $ensure,
+    source  => $source,
+    content => $content,
+    require => Package['munin-node'],
+    notify  => Service['munin-node'],
+  }
 }