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

diff --git a/modules/munin/manifests/conf.pp b/modules/munin/manifests/conf.pp
index a4ac0ab7e..ad557abe2 100644
--- a/modules/munin/manifests/conf.pp
+++ b/modules/munin/manifests/conf.pp
@@ -16,9 +16,19 @@ define munin::conf (
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
-	file { "/etc/munin/plugin-conf.d/${name}":
-		ensure  => $ensure,
-		require => Package['munin-node'],
-		notify  => Service['munin-node'],
+	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'],
+		}
 	}
 }