Commit graph

30 commits

Author SHA1 Message Date
Maxence Dunnewind
8e83e57a29 remove unneeded ',' 2013-03-13 14:25:47 +01:00
Wijnand Modderman-Lenstra
4396d601d6 Move away from defining resource defaults, we can just pass $source and $content directly to the file resource
Using the case statement does not properly notify the file resource about
changes, leading to unexpected results when generating fragments from Puppet
templates. This patch fixes that issue.
2013-02-28 13:00:11 +01:00
Raphael Lorenzeto
4ec1d5df0d Adding more helpful message for 'pluginsync = true'. 2013-02-24 08:28:19 -03:00
Jasper Poppe
c854799c53 added description of replace in the comment block 2012-12-12 15:14:51 +01:00
Jasper Poppe
2f35c78a9e added (file) $replace parameter to concat 2012-12-12 14:33:47 +01:00
Marc Haber
8b3397bdd4 gracefully handle \n in fragment resource name 2012-11-06 10:54:35 +01:00
Jan Vansteenkiste
370e60280d Fixes various puppet-lint warnings.
* ./manifests/init.pp - WARNING: ensure found on line but it's not the first attribute on line 222
* ./manifests/setup.pp - WARNING: selector inside resource block on line 34
* ./manifests/fragment.pp - WARNING: case statement without a default case on line 28
2012-08-30 12:33:50 +02:00
Jan Vansteenkiste
6a0c1f9a39 Document the path parameter and provide a small use case. 2012-08-30 11:06:58 +02:00
Jan Vansteenkiste
3ac955e05d Allow overriding the target path of a (concat) file and use a custom name. 2012-08-30 10:09:28 +02:00
Andreas Jaggi
721ef012e2 Remove trailing whitespace in comment
puppet-lint does not like trailing whitespaces
2012-08-14 17:13:25 +02:00
R.I.Pienaar
a0661e1764 Merge pull request #27 from djmitche/auto-setup
Include concat::setup from concat, so users don't need to
2012-07-11 15:22:25 -07:00
Dustin J. Mitchell
0ba071858d Include concat::setup from concat, so users don't need to 2012-07-11 16:54:05 -05:00
Dustin J. Mitchell
092afd4193 Remove spurious 'e' character. 2012-07-11 16:46:12 -05:00
Paul Belanger
534fd8b7a4 Reformatting for puppet-lint
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-23 17:45:57 -04:00
Sharif Nassar
21d0d2abf2 Fail with helpful advice if $::concat_basedir is not yet set
Building on the new docs in https://github.com/ripienaar/puppet-concat/pull/20
2012-05-23 14:35:08 -07:00
Gildas Le Nadan
0bbbe320cc add information about concat_basedir and the need for pluginsync = true at least once 2012-05-20 20:24:22 +02:00
Erik Dalén
800bec11ae Style guideline fixes
Comply better with puppet community style guidelines.

Change-Id: Ie1782d266539b1a8f9890b2ade77280011aa22aa
2012-04-24 16:53:20 +02:00
Reid Vandewiele
81d5ee80f3 Remove the gnu parameter from concat
Previously, the concatfragments.sh script was would default to using
GNU-specific flags for find, sort, and xargs. This necessitated
explicit passing of a "gnu = false" parameter to the concat define in
order to successfully run the script without GNU-specific flags when
working with systems that do not by default include GNU versions of the
utilities (solaris, for example).

This commit modifies the concatfragments script such that GNU versions
of the utilities are not needed at all. It does this while preserving
the original use case for the GNU flags, which was to allow special
characters (like spaces) in the filenames, which it accomplished by
using GNU flags to separate fields using null characters instead of
newlines.

In order to preserve backwards-compatibility with existing puppet
installations that make use of the "gnu = false" parameter, the
parameter list for the concat define has not been changed. Rather, the
gnu parameter is now deprecated and ignored.
2012-04-17 12:02:38 -07:00
Sharif Nassar
30c96286c9 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.
2011-12-14 13:45:46 -08:00
Christian G. Warden
7722415753 Fix use of unqualified variable names
Fully qualify $::id, $::puppetversion, and $::concat_basedir.
2011-12-05 16:19:24 -08:00
Peter Meier
b9e33c4e6b finish work for unpriviledged user
To be able to use the module as an unprivileged user we need to
adjust certain things:

* only enforce the run user and group if we are root and can
  actually change the user
* set owner/group of our files and directories to our own user/group
* place the concat script in a location we can write -> use the
  concat dir for that.
2011-06-23 13:57:09 +02:00
Peter Meier
45dfa6984c don't use a hardcoded concatdir
Get the concat base directory from a fact -> makes it useable if
Puppet's :vardir is not /var/lib/puppet/. This fixes problems with
PE and makes the module also useable for puppet runs as
unpriviledged user.
2011-06-23 11:05:43 +02:00
Sharif Nassar
96936d9efb Make sure interesting data in the concatdir is only available to root 2011-06-20 13:31:25 -07:00
Pierre-Yves Ritschard
031bf26128 - make the root group configurable in the concat::setup class for portability
- use sh and not bash
2011-02-03 18:01:36 +00:00
Jonathan Boyett
fa80fc2b31 add a -g flag to concatfragments.sh to disable GNU extensions to find, sort and xargs; makes concat work on Solaris.
Add a $gnu parameter to make use of the aforementioned -g flag, and a $order parameter to make use of the -n flag in concatfragments.sh
2010-12-03 12:35:23 -08:00
martin f. krafft
af63a0b3eb Parametrize warning message
The concat warn parameter can now be any string (and needs to include
the appropriate commenting character) and will then override the default
(which still gets printed when warn=>true).

Signed-off-by: martin f. krafft <madduck@madduck.net>
2010-10-04 22:46:18 +01:00
R.I.Pienaar
18a7897992 Make the filebucket behavior of files configurable 2010-07-14 13:01:45 +01:00
R.I.Pienaar
86f1837c70 improve documentation 2010-05-22 11:09:47 +01:00
R.I.Pienaar
d09acb4a42 Improve error message and documentation 2010-05-07 19:15:21 +01:00
R.I.Pienaar
ee1fe7a023 Pull in work from private Subversion repository 2010-05-06 22:55:02 +01:00