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 (file)
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 971b9fa3409f131c4faa9795c71775a6fe073b2b..a59102fcc988bc2e2c4777d9f84159d5b5053eec 100644 (file)
--- 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;
                }