summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR.I.Pienaar <rip@devco.net>2010-07-14 13:01:45 +0100
committerR.I.Pienaar <rip@devco.net>2010-07-14 13:01:45 +0100
commit18a78979923c6284562fd31fc4a080995fd364f8 (patch)
treee1070ccc3140a1d5b7eb7878c69a9512294f8fba
parent1fb38b2961e3c778be3c09de269b2f843ec59f30 (diff)
downloadpuppet-concat-18a78979923c6284562fd31fc4a080995fd364f8.tar.gz
puppet-concat-18a78979923c6284562fd31fc4a080995fd364f8.tar.bz2
Make the filebucket behavior of files configurable
-rw-r--r--CHANGELOG1
-rwxr-xr-xmanifests/fragment.pp5
-rwxr-xr-xmanifests/init.pp11
3 files changed, 12 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 90611b4..b09f4eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,3 +23,4 @@ CHANGELOG:
to include the contents of a symlink into the final file.
- 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name
- 2010/05/22 - Improve documentation and show the use of ensure =>
+- 2010/07/14 - Add support for setting the filebucket behavior of files
diff --git a/manifests/fragment.pp b/manifests/fragment.pp
index cc21f39..890d43a 100755
--- a/manifests/fragment.pp
+++ b/manifests/fragment.pp
@@ -11,7 +11,9 @@
# - mode Mode for the file
# - owner Owner of the file
# - group Owner of the file
-define concat::fragment($target, $content='', $source='', $order=10, $ensure = "present", $mode = 0644, $owner = root, $group = root) {
+# - backup Controls the filebucketing behavior of the final file and
+# see File type reference for its use. Defaults to 'puppet'
+define concat::fragment($target, $content='', $source='', $order=10, $ensure = "present", $mode = 0644, $owner = root, $group = root, $backup = "puppet") {
$safe_name = regsubst($name, '/', '_', 'G')
$safe_target_name = regsubst($target, '/', '_', 'G')
$concatdir = $concat::setup::concatdir
@@ -40,6 +42,7 @@ define concat::fragment($target, $content='', $source='', $order=10, $ensure = "
owner => $owner,
group => $group,
ensure => $ensure,
+ backup => $backup,
alias => "concat_fragment_${name}",
notify => Exec["concat_${target}"]
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 745eba6..41a65ba 100755
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -71,6 +71,8 @@
# - force Enables creating empty files if no fragments are present
# - warn Adds a normal shell style comment top of the file indicating
# 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'
#
# ACTIONS:
# - Creates fragment directories if it didn't exist already
@@ -85,7 +87,7 @@
# ALIASES:
# - The exec can notified using Exec["concat_/path/to/file"] or Exec["concat_/path/to/directory"]
# - The final file can be referened as File["/path/to/file"] or File["concat_/path/to/file"]
-define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $force = "false") {
+define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $force = "false", $backup = "puppet") {
$safe_name = regsubst($name, '/', '_', 'G')
$concatdir = $concat::setup::concatdir
$version = $concat::setup::majorversion
@@ -105,9 +107,10 @@ define concat($mode = 0644, $owner = "root", $group = "root", $warn = "false", $
}
File{
- owner => root,
- group => root,
- mode => $mode,
+ owner => root,
+ group => root,
+ mode => $mode,
+ backup => $backup
}
file{$fragdir: