summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR.I.Pienaar <rip@devco.net>2012-12-12 06:21:53 -0800
committerR.I.Pienaar <rip@devco.net>2012-12-12 06:21:53 -0800
commit0fb347d40183661007a0e6f4247f3b00f5fbc4de (patch)
treebf71719c9708286290190ead4e8160aa5683fb02
parent483edb52dfb3f79a3bedb3179c824d27397ef067 (diff)
parentc854799c53e8c40a437f42a44b0b0decc7746285 (diff)
downloadpuppet-concat-0fb347d40183661007a0e6f4247f3b00f5fbc4de.tar.gz
puppet-concat-0fb347d40183661007a0e6f4247f3b00f5fbc4de.tar.bz2
Merge pull request #38 from jpoppe/master
added (file) $replace parameter to concat
-rw-r--r--CHANGELOG1
-rw-r--r--manifests/init.pp12
2 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index efed649..139a638 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,3 +37,4 @@ CHANGELOG:
- 2012/08/30 - The target path can be different from the $name
- 2012/08/30 - More Puppet Lint cleanup
- 2012/09/04 - RELEASE 0.2.0
+- 2012/12/12 - Added (file) $replace parameter to concat
diff --git a/manifests/init.pp b/manifests/init.pp
index 960098d..b309059 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -102,6 +102,8 @@
# that it is built by puppet
# - backup Controls the filebucketing behavior of the final file and
# see File type reference for its use. Defaults to 'puppet'
+# - replace Whether to replace a file that already exists on the local
+# system
#
# ACTIONS:
# - Creates fragment directories if it didn't exist already
@@ -129,6 +131,7 @@ define concat(
$warn = false,
$force = false,
$backup = 'puppet',
+ $replace = true,
$gnu = undef,
$order='alpha'
) {
@@ -184,10 +187,11 @@ define concat(
}
File {
- owner => $::id,
- group => $group,
- mode => $mode,
- backup => $backup
+ owner => $::id,
+ group => $group,
+ mode => $mode,
+ backup => $backup,
+ replace => $replace
}
file { $fragdir: