opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #27 from djmitche/auto-setup

Browse source 
Include concat::setup from concat, so users don't need to
This commit is contained in:
R.I.Pienaar 2012-07-11 15:22:25 -07:00
commit a0661e1764
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.markdown
View file

@ -29,7 +29,6 @@ their changes will be incorporated into the puppet managed motd.
<pre> <pre>
# class to setup basic motd, include on all nodes # class to setup basic motd, include on all nodes
class motd { class motd {
include concat::setup
$motd = "/etc/motd" $motd = "/etc/motd"
concat{$motd: concat{$motd:

5
manifests/init.pp
View file

@ -43,9 +43,6 @@
# There's some regular expression magic to figure out the puppet version but # 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 # 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: # DETAIL:
# We use a helper shell script called concatfragments.sh that gets placed # We use a helper shell script called concatfragments.sh that gets placed
# in <Puppet[:vardir]>/concat/bin to do the concatenation. While this might # in <Puppet[:vardir]>/concat/bin to do the concatenation. While this might
@ -106,6 +103,8 @@ define concat(
$gnu = undef, $gnu = undef,
$order='alpha' $order='alpha'
) { ) {
include concat::setup
$safe_name = regsubst($name, '/', '_', 'G') $safe_name = regsubst($name, '/', '_', 'G')
$concatdir = $concat::setup::concatdir $concatdir = $concat::setup::concatdir
$version = $concat::setup::majorversion $version = $concat::setup::majorversion