Merge pull request #27 from djmitche/auto-setup
Include concat::setup from concat, so users don't need to
This commit is contained in:
commit
a0661e1764
2 changed files with 2 additions and 4 deletions
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue