Include concat::setup from concat, so users don't need to

diff --git a/README.markdown b/README.markdown
index bb9571aa92e78b51579c77c12e9c234ecce20b90..cbaa0f2cb4ed793e2398d3cf47cc6c158eac9be7 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -29,7 +29,6 @@ their changes will be incorporated into the puppet managed motd.
 <pre>
 # class to setup basic motd, include on all nodes
 class motd {
-   include concat::setup
    $motd = "/etc/motd"
 
    concat{$motd:

diff --git a/manifests/init.pp b/manifests/init.pp
index bd9d75195185d842a706c5dc06c5146e1832efe8..9866a5d71fbfbbd8711d6409997c288f7bdcfe41 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -43,9 +43,6 @@
 # There's some regular expression magic to figure out the puppet version but
 # if you're on an older 0.24 version just set $puppetversion = 24
 #
-# Before you can use any of the concat features you should include the
-# class concat::setup somewhere on your node first.
-#
 # DETAIL:
 # We use a helper shell script called concatfragments.sh that gets placed
 # in <Puppet[:vardir]>/concat/bin to do the concatenation.  While this might
@@ -106,6 +103,8 @@ define concat(
   $gnu = undef,
   $order='alpha'
 ) {
+  include concat::setup
+
   $safe_name   = regsubst($name, '/', '_', 'G')
   $concatdir   = $concat::setup::concatdir
   $version     = $concat::setup::majorversion