From ab64af9dc5714c7775e97592d26aa7b94604697e Mon Sep 17 00:00:00 2001
From: Marc Haber <mh+puppet-concat@zugschlus.de>
Date: Tue, 6 Nov 2012 10:31:07 +0100
Subject: refer to manifest files for option docs

---
 README.markdown | 3 +++
 1 file changed, 3 insertions(+)

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,
-- 
cgit v1.2.3


From 8b3397bdd48756e72f0396223b30fe63b8cf978b Mon Sep 17 00:00:00 2001
From: Marc Haber <mh+puppet-concat@zugschlus.de>
Date: Tue, 6 Nov 2012 10:31:54 +0100
Subject: gracefully handle \n in fragment resource name

---
 manifests/fragment.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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}"
 
-- 
cgit v1.2.3