diff options
author | david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1> | 2007-08-07 14:15:44 +0000 |
---|---|---|
committer | david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1> | 2007-08-07 14:15:44 +0000 |
commit | a73085c7e09db81adceb789efce6e561162583c7 (patch) | |
tree | 693243cec7aa3295d2dac8ecea9e028d12eed6f7 /manifests/defines/concatenated_file.pp | |
parent | 9b9856b60e823a431e9ea06b42da64c231eeef36 (diff) | |
download | puppet-common-a73085c7e09db81adceb789efce6e561162583c7.tar.gz puppet-common-a73085c7e09db81adceb789efce6e561162583c7.tar.bz2 |
more fixes for the munin modularizsation
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@178 f03ff2f1-f02d-0410-970d-b9634babeaa1
Diffstat (limited to 'manifests/defines/concatenated_file.pp')
-rw-r--r-- | manifests/defines/concatenated_file.pp | 4 |
1 files changed, 2 insertions, 2 deletions
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], |