Merge pull request #38 from jpoppe/master
added (file) $replace parameter to concat
This commit is contained in:
commit
0fb347d401
2 changed files with 9 additions and 4 deletions
|
@ -37,3 +37,4 @@ CHANGELOG:
|
||||||
- 2012/08/30 - The target path can be different from the $name
|
- 2012/08/30 - The target path can be different from the $name
|
||||||
- 2012/08/30 - More Puppet Lint cleanup
|
- 2012/08/30 - More Puppet Lint cleanup
|
||||||
- 2012/09/04 - RELEASE 0.2.0
|
- 2012/09/04 - RELEASE 0.2.0
|
||||||
|
- 2012/12/12 - Added (file) $replace parameter to concat
|
||||||
|
|
|
@ -102,6 +102,8 @@
|
||||||
# that it is built by puppet
|
# that it is built by puppet
|
||||||
# - backup Controls the filebucketing behavior of the final file and
|
# - backup Controls the filebucketing behavior of the final file and
|
||||||
# see File type reference for its use. Defaults to 'puppet'
|
# see File type reference for its use. Defaults to 'puppet'
|
||||||
|
# - replace Whether to replace a file that already exists on the local
|
||||||
|
# system
|
||||||
#
|
#
|
||||||
# ACTIONS:
|
# ACTIONS:
|
||||||
# - Creates fragment directories if it didn't exist already
|
# - Creates fragment directories if it didn't exist already
|
||||||
|
@ -129,6 +131,7 @@ define concat(
|
||||||
$warn = false,
|
$warn = false,
|
||||||
$force = false,
|
$force = false,
|
||||||
$backup = 'puppet',
|
$backup = 'puppet',
|
||||||
|
$replace = true,
|
||||||
$gnu = undef,
|
$gnu = undef,
|
||||||
$order='alpha'
|
$order='alpha'
|
||||||
) {
|
) {
|
||||||
|
@ -184,10 +187,11 @@ define concat(
|
||||||
}
|
}
|
||||||
|
|
||||||
File {
|
File {
|
||||||
owner => $::id,
|
owner => $::id,
|
||||||
group => $group,
|
group => $group,
|
||||||
mode => $mode,
|
mode => $mode,
|
||||||
backup => $backup
|
backup => $backup,
|
||||||
|
replace => $replace
|
||||||
}
|
}
|
||||||
|
|
||||||
file { $fragdir:
|
file { $fragdir:
|
||||||
|
|
Loading…
Reference in a new issue