soler: decomission rt#5890

[dsa-puppet.git] / modules / munin / manifests / conf.pp

diff --git a/modules/munin/manifests/conf.pp b/modules/munin/manifests/conf.pp
index a4ac0ab7e278cd1011b8287019406c2875d3cad5..ad557abe2ec5e1aae6787c75adda86625c3d9ff9 100644 (file)
--- 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'],
+               }
        }
 }