aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david@schmitt.edv-bus.at>2008-06-30 13:47:30 +0200
committerDavid Schmitt <david@schmitt.edv-bus.at>2008-06-30 13:47:30 +0200
commitb24eaae55e444c4662cfc9fa14012ade97039b01 (patch)
treea21efeab9ce8f31c1bfba9faf81f5ece2b17edfd
parent07ebdfa2c59684e79b0a1904858c9072b47601c5 (diff)
downloadpuppet-common-b24eaae55e444c4662cfc9fa14012ade97039b01.tar.gz
puppet-common-b24eaae55e444c4662cfc9fa14012ade97039b01.tar.bz2
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.
-rw-r--r--files/empty/.ignore1
-rw-r--r--manifests/defines/modules_dir.pp2
2 files changed, 3 insertions, 0 deletions
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;
}