From a73085c7e09db81adceb789efce6e561162583c7 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 7 Aug 2007 14:15:44 +0000 Subject: more fixes for the munin modularizsation git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@178 f03ff2f1-f02d-0410-970d-b9634babeaa1 --- manifests/defines/concatenated_file.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/defines/concatenated_file.pp') diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp index 865a1ee..140ac35 100644 --- a/manifests/defines/concatenated_file.pp +++ b/manifests/defines/concatenated_file.pp @@ -36,7 +36,7 @@ define concatenated_file ( } # if there is a header or footer file, add it - $additional_cmd = "$header" ? { + $additional_cmd = $header ? { '' => $footer ? { '' => '', default => "| cat - '${footer}' " @@ -48,7 +48,7 @@ define concatenated_file ( } # use >| to force clobbering the target file - exec { "/usr/bin/find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat ${header_cmd} >| ${name}.puppettmp": + exec { "/usr/bin/find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat ${additional_cmd} >| ${name}": refreshonly => true, subscribe => File[$dir], before => File[$name], -- cgit v1.2.3