From: Sharif Nassar <sharif@mediatemple.net>
Date: Wed, 14 Dec 2011 21:45:06 +0000 (-0800)
Subject: Fix comments to match actual behavior, clean up old script.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=30c96286c9760259bc654ebde9f330bf68c0ed6d;p=puppet-concat.git

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.
---

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;
     }
 }