add refreshonly and notifies; minor shell fixes

git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@167 f03ff2f1-f02d-0410-970d-b9634babeaa1

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index eeed8dcc88954e0f07db522376ec80714e14619c..625cff7d4d97300448b8342af7e746de16da4df4 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -22,17 +22,19 @@ define concatenated_file (
                        source => "puppet://$servername/common/empty",
                        checksum => mtime,
                        recurse => true, purge => true, force => true,
-                       mode => $mode, owner => $owner, group => $group;
+                       mode => $mode, owner => $owner, group => $group,
+                       notify => Exec["concat_${name}"];
                $name:
                        ensure => present, checksum => md5,
                        mode => $mode, owner => $owner, group => $group;
        }
 
-       exec { "/usr/bin/find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat > ${name}":
-               # refreshonly => true,
+       # use >| to force clobbering the target file
+       exec { "/usr/bin/find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat >| ${name}":
+               refreshonly => true,
                subscribe => File[$dir],
                before => File[$name],
-               alias => "concat_${name}",
+               alias => [ "concat_${name}", "concat_${dir}"] ,
        }
 }
 
@@ -49,6 +51,7 @@ define concatenated_file_part (
                ensure => $ensure, content => $content,
                mode => $mode, owner => $owner, group => $group,
                alias => "cf_part_${name}",
+               notify => Exec["concat_${dir}"],
        }
 
 }