fixed up refresh behaviour, still have to run the concat every time, but requirors...

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

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 2c43bf00fc9c2f85cf71c3f53aabe494e360942a..35590fa68223ae8addfead974046d9decf53f91f 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -19,18 +19,19 @@ define concatenated_file (
 {
        file {
                $dir:
-                       ensure => directory, checksum => mtime,
-                       ## This doesn't work as expected
-                       #recurse => true, purge => true, noop => true,
+                       source => "puppet://$servername/common/empty",
+                       checksum => mtime,
+                       recurse => true, purge => true,
                        mode => $mode, owner => $owner, group => $group;
                $name:
                        ensure => present, checksum => md5,
                        mode => $mode, owner => $owner, group => $group;
        }
 
-       exec { "find ${dir} -maxdepth 1 -type f ! -name '*puppettmp' -print0 | sort -z | xargs -0 cat > ${name}":
-               refreshonly => true,
+       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}",
        }
 }