Merge pull request #35 from Zugschlus/master

please consider pulling
This commit is contained in:
R.I.Pienaar 2012-11-06 01:59:57 -08:00
commit 483edb52df
2 changed files with 5 additions and 2 deletions

View file

@ -74,6 +74,9 @@ class apache {
}
</pre>
Detailed documentation of the class options can be found in the
manifest files.
Known Issues:
-------------
* Since puppet-concat now relies on a fact for the concat directory,

View file

@ -14,8 +14,8 @@
# - 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 = $::id, $group = $concat::setup::root_group, $backup = 'puppet') {
$safe_name = regsubst($name, '/', '_', 'G')
$safe_target_name = regsubst($target, '/', '_', 'G')
$safe_name = regsubst($name, '[/\n]', '_', 'GM')
$safe_target_name = regsubst($target, '[/\n]', '_', 'GM')
$concatdir = $concat::setup::concatdir
$fragdir = "${concatdir}/${safe_target_name}"