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

2 files changed, 25 insertions, 12 deletions

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 140ac35..f4ba791 100644
--- 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 7f59c60..ae6bf38 100644
--- 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;
+		}
 	}
 }