diff options
| author | mh <mh@immerda.ch> | 2011-07-15 15:21:10 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-07-15 16:04:48 +0200 |
| commit | 5597f5bbcb7bf0f6191e6b9247db0af4892a766e (patch) | |
| tree | b11a61fda27ba178a95e7775ff0990e304c52e0f | |
| parent | ad2be0a0f8eb24149761a8bade28ef9c222af1af (diff) | |
| download | puppet-common-5597f5bbcb7bf0f6191e6b9247db0af4892a766e.tar.gz puppet-common-5597f5bbcb7bf0f6191e6b9247db0af4892a766e.tar.bz2 | |
it is not anymore necessary to have an empty directory as source to purge things
| -rw-r--r-- | files/empty/.ignore | 0 | ||||
| -rw-r--r-- | manifests/defines/concatenated_file.pp | 2 | ||||
| -rw-r--r-- | manifests/defines/module_dir.pp | 2 | ||||
| -rw-r--r-- | manifests/moduledir.pp | 2 |
4 files changed, 0 insertions, 6 deletions
diff --git a/files/empty/.ignore b/files/empty/.ignore deleted file mode 100644 index e69de29..0000000 --- a/files/empty/.ignore +++ /dev/null diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp index 5f1c275..8eed351 100644 --- 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 227fe71..2852f83 100644 --- 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 df83e60..85c29d6 100644 --- 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; } |