it is not anymore necessary to have an empty directory as source to purge things
This commit is contained in:
parent
ad2be0a0f8
commit
5597f5bbcb
4 changed files with 0 additions and 6 deletions
|
@ -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}"];
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue