common: fix clash between modules_dir and concatenated_file(dir) better

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 140ac35320b04a86de07df2b4b8bac8c78081203..f4ba791f4773ba038b7798675057e2989394931f 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -23,13 +23,21 @@ define concatenated_file (
        $mode = 0644, $owner = root, $group = root
        )
 {
+
+       if defined(File[$dir]) {
+               debug("${dir} already defined")
+       } else {
+               file {
+                       $dir:
+                               source => "puppet://$servername/common/empty",
+                               checksum => mtime,
+                               recurse => true, purge => true, force => true,
+                               mode => $mode, owner => $owner, group => $group,
+                               notify => Exec["concat_${name}"];
+               }
+       }
+
        file {
-               $dir:
-                       source => "puppet://$servername/common/empty",
-                       checksum => mtime,
-                       recurse => true, purge => true, force => true,
-                       mode => $mode, owner => $owner, group => $group,
-                       notify => Exec["concat_${name}"];
                $name:
                        ensure => present, checksum => md5,
                        mode => $mode, owner => $owner, group => $group;

diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
index 7f59c60d6e52e340302c61b95c99ba8bcee3e742..ae6bf38548aca25773fd76ceec7520e01d42b3c2 100644 (file)
--- a/manifests/defines/modules_dir.pp
+++ b/manifests/defines/modules_dir.pp
@@ -10,11 +10,16 @@ define modules_dir (
                $mode = 0755, $owner = root, $group = root
        )
 {
-       file {
-               "/var/lib/puppet/modules/${name}":
-                       source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"], 
-                       checksum => mtime,
-                       recurse => true, purge => true, force => true,
-                       mode => $mode, owner => $owner, group => $group;
+       $dir = "/var/lib/puppet/modules/${name}"
+       if defined(File[$dir]) {
+               debug("${dir} already defined")
+       } else {
+               file {
+                       "/var/lib/puppet/modules/${name}":
+                               source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"], 
+                               checksum => mtime,
+                               recurse => true, purge => true, force => true,
+                               mode => $mode, owner => $owner, group => $group;
+               }
        }
 }