diff options
| author | Dustin J. Mitchell <dustin@mozilla.com> | 2012-07-11 16:52:31 -0500 |
|---|---|---|
| committer | Dustin J. Mitchell <dustin@mozilla.com> | 2012-07-11 16:54:05 -0500 |
| commit | 0ba071858db5c4e9c698fd2b67694ba63f40a076 (patch) | |
| tree | 65d256bfe366e485f0ec07082b6208de41be2df3 | |
| parent | 4d1977b2c47164daf41dfca2245806ed745933f4 (diff) | |
| download | puppet-concat-0ba071858db5c4e9c698fd2b67694ba63f40a076.tar.gz puppet-concat-0ba071858db5c4e9c698fd2b67694ba63f40a076.tar.bz2 | |
Include concat::setup from concat, so users don't need to
| -rw-r--r-- | README.markdown | 1 | ||||
| -rw-r--r-- | manifests/init.pp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/README.markdown b/README.markdown index bb9571a..cbaa0f2 100644 --- 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 bd9d751..9866a5d 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 |