From: David Schmitt <david@schmitt.edv-bus.at>
Date: Mon, 30 Jun 2008 11:47:30 +0000 (+0200)
Subject: modules_dir: nail empty directory files/empty/ into the repo
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b24eaae55e444c4662cfc9fa14012ade97039b01;p=puppet-common.git

modules_dir: nail empty directory files/empty/ into the repo

Since git ignores empty directories, I had to create a placeholder to
fool git. The placeholder is ignored in the define.
---

diff --git a/files/empty/.ignore b/files/empty/.ignore
new file mode 100644
index 0000000..ce47061
--- /dev/null
+++ b/files/empty/.ignore
@@ -0,0 +1 @@
+A placeholder to nail this directory into git
diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
index 971b9fa..a59102f 100644
--- a/manifests/defines/modules_dir.pp
+++ b/manifests/defines/modules_dir.pp
@@ -18,6 +18,8 @@ define modules_dir (
 			"/var/lib/puppet/modules/${name}":
 				source => [ "puppet:///${name}/modules_dir", "puppet:///common/empty"],
 				checksum => mtime,
+				# ignore the placeholder
+				ignore => '.ignore', 
 				recurse => true, purge => true, force => true,
 				mode => $mode, owner => $owner, group => $group;
 		}