it is not anymore necessary to have an empty directory as source to purge things

diff --git a/files/empty/.ignore b/files/empty/.ignore
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 5f1c2750faa3077fce7f06206fb7b23ae16d3ba3..8eed351ae5e8e271048728cc1e6b3915e6ab4b51 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -55,9 +55,7 @@ define concatenated_file (
                   'present' => directory,
                   default => $ensure
                 },
-                source => "puppet:///modules/common/empty",
                 checksum => mtime,
-                ignore => '.ignore',
                 recurse => true, purge => true, force => true,
                 mode => $mode, owner => $owner, group => $group,
                 notify => Exec["concat_${name}"];

diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index 227fe717455f4280da0dd424396166e931529e2d..2852f830b0ccebc6490886ad6ad2db4336c5cce9 100644 (file)
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -31,10 +31,8 @@ define module_dir (
     } else {
         file {
             $dir:
-                source => [ "puppet:///modules/${name}/modules_dir", "puppet:///modules/common/empty"],
                 checksum => mtime,
                 # ignore the placeholder
-                ignore => '.ignore',
                 recurse => true, purge => true, force => true,
                 mode => $mode, owner => $owner, group => $group;
         }

diff --git a/manifests/moduledir.pp b/manifests/moduledir.pp
index df83e608deb943ce82e727978d7c9fd351ed923b..85c29d64deaa51cb214b7127893ab9cf643f891b 100644 (file)
--- a/manifests/moduledir.pp
+++ b/manifests/moduledir.pp
@@ -7,8 +7,6 @@ class common::moduledir {
     # module-local data, e.g. for constructing config files
     file{$module_dir_path:
         ensure => directory,
-        source => "puppet:///modules/common/modules/",
-        ignore => '.ignore',
         recurse => true, purge => true, force => true,
         mode => 0755, owner => root, group => 0;
     }