diff options
author | Sharif Nassar <sharif@mediatemple.net> | 2011-12-14 13:45:06 -0800 |
---|---|---|
committer | Sharif Nassar <sharif@mediatemple.net> | 2011-12-14 13:45:46 -0800 |
commit | 30c96286c9760259bc654ebde9f330bf68c0ed6d (patch) | |
tree | aa283c11c4213b64a3b9bd43ac294539bacd0da8 | |
parent | bd21154fa036e47a1b994c20e0d9fed86251b7e4 (diff) | |
download | puppet-concat-30c96286c9760259bc654ebde9f330bf68c0ed6d.tar.gz puppet-concat-30c96286c9760259bc654ebde9f330bf68c0ed6d.tar.bz2 |
Fix comments to match actual behavior, clean up old script.
* Zap the old copy of /usr/local/bin/concatfragments.sh.
* Fix comments to point at new location of script.
* Delete trailing whitespace.
-rw-r--r-- | manifests/setup.pp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/setup.pp b/manifests/setup.pp index 2c1d343..584f58a 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -7,11 +7,11 @@ # $puppetversion should be either 24 or 25 to enable a 24 compatible # mode, in 24 mode you might see phantom notifies this is a side effect # of the method we use to clear the fragments directory. -# +# # The regular expression below will try to figure out your puppet version # but this code will only work in 0.24.8 and newer. # -# It also copies out the concatfragments.sh file to /usr/local/bin +# It also copies out the concatfragments.sh file to ${concatdir}/bin class concat::setup { $id = $::id $root_group = $id ? { @@ -35,6 +35,10 @@ class concat::setup { owner => $id, group => $root_group, mode => '0750'; + + ## Old versions of this module used a different path. + '/usr/local/bin/concatfragments.sh': + ensure => absent; } } |