diff options
author | R.I.Pienaar <rip@devco.net> | 2012-07-11 15:22:25 -0700 |
---|---|---|
committer | R.I.Pienaar <rip@devco.net> | 2012-07-11 15:22:25 -0700 |
commit | a0661e17646fa8e1ec03f813c28d97b64c93019d (patch) | |
tree | 6df3e6ec381bb4d10118480438d46219a6d3710a /manifests | |
parent | a1f58957f27df096da5e12a0fb20c39ab5a9f98e (diff) | |
parent | 0ba071858db5c4e9c698fd2b67694ba63f40a076 (diff) | |
download | puppet-concat-a0661e17646fa8e1ec03f813c28d97b64c93019d.tar.gz puppet-concat-a0661e17646fa8e1ec03f813c28d97b64c93019d.tar.bz2 |
Merge pull request #27 from djmitche/auto-setup
Include concat::setup from concat, so users don't need to
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/init.pp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c2b88a8..8741ec7 100644 --- 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 |