Apply Aurelien's nfs patch to the dsa-check-libs copy in puppet also

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

diff --git a/modules/munin/manifests/check.pp b/modules/munin/manifests/check.pp
index ee88ca0bc6e19b252935d1576ad371fca10ad0a5..b122385b76193c8e26574b53aa20c624599eab01 100644 (file)
--- a/modules/munin/manifests/check.pp
+++ b/modules/munin/manifests/check.pp
@@ -1,5 +1,7 @@
 define munin::check($ensure = present, $script = undef) {
 
+       include munin
+
        if $script {
                $link = $script
        } else {
@@ -7,13 +9,14 @@ define munin::check($ensure = present, $script = undef) {
        }
 
        $link_target = $ensure ? {
-               present => "/usr/share/munin/plugins/${link}",
+               present => link,
                absent  => absent,
-               default => err ( "Unknown ensure value: '$ensure'" ),
+               default => fail ( "Unknown ensure value: '$ensure'" ),
        }
 
        file { "/etc/munin/plugins/${name}":
                ensure  => $link_target,
+               target  => "/usr/share/munin/plugins/${link}",
                require => Package['munin-node'],
                notify  => Service['munin-node'],
        }