diff options
| author | R.I.Pienaar <rip@devco.net> | 2012-11-06 01:59:57 -0800 |
|---|---|---|
| committer | R.I.Pienaar <rip@devco.net> | 2012-11-06 01:59:57 -0800 |
| commit | 483edb52dfb3f79a3bedb3179c824d27397ef067 (patch) | |
| tree | 850c0d3f26295a99ed6e00e90e304c83d702ca77 | |
| parent | aaf2eeb02739513e83aa07c753f5b7180999fe8a (diff) | |
| parent | 8b3397bdd48756e72f0396223b30fe63b8cf978b (diff) | |
| download | puppet-concat-483edb52dfb3f79a3bedb3179c824d27397ef067.tar.gz puppet-concat-483edb52dfb3f79a3bedb3179c824d27397ef067.tar.bz2 | |
Merge pull request #35 from Zugschlus/master
please consider pulling
| -rw-r--r-- | README.markdown | 3 | ||||
| -rw-r--r-- | manifests/fragment.pp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/README.markdown b/README.markdown index ecd9eaf..8ee04d7 100644 --- a/README.markdown +++ b/README.markdown @@ -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, diff --git a/manifests/fragment.pp b/manifests/fragment.pp index 68bfd9b..cf55f8b 100644 --- a/manifests/fragment.pp +++ b/manifests/fragment.pp @@ -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}" |