opuppet/module-concat
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
71 commits 2 branches 0 tags 394 KiB
Commit graph

71 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Haber
8b3397bdd4 gracefully handle \n in fragment resource name 2012-11-06 10:54:35 +01:00
Marc Haber
ab64af9dc5 refer to manifest files for option docs 2012-11-06 10:31:07 +01:00
R.I.Pienaar
aaf2eeb027 fix markup 2012-09-04 12:45:45 +01:00
R.I.Pienaar
e9f150c5af Prepare for version 0.2.0 2012-09-04 12:40:42 +01:00
R.I.Pienaar
e8e1282b6d Merge pull request #32 from UnifiedPost/develop 
Fixes various puppet-lint warnings.
 2012-08-30 03:39:47 -07: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
R.I.Pienaar
7490f60302 Merge pull request #31 from UnifiedPost/develop 
Allow using a custom name and provide a path to the file that needs to be created using concat.
 2012-08-30 02:11:02 -07:00
Jan Vansteenkiste
6a0c1f9a39 Document the path parameter and provide a small use case. 2012-08-30 11:06:58 +02:00
Jan Vansteenkiste
1972a9b86b Add a second spec test for the name/path combination 2012-08-30 10:10:23 +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
R.I.Pienaar
00259779ef Merge pull request #29 from x-way/master 
Add puppet-lint and rspec-puppet gems to make Travis CI work again
 2012-08-14 09:45:36 -07:00
Andreas Jaggi
fbf13c9711 Add puppet-lint and rspec-puppet gem for Travis CI 2012-08-14 18:23:44 +02:00
R.I.Pienaar
e7a8c16cdb Merge pull request #28 from x-way/master 
Remove trailing whitespace to make puppet-lint happy
 2012-08-14 08:27:52 -07: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
R.I.Pienaar
a1f58957f2 Merge pull request #26 from djmitche/patch-1 
Remove spurious 'e' character.
 2012-07-11 14:49:17 -07:00
Dustin J. Mitchell
092afd4193 Remove spurious 'e' character. 2012-07-11 16:46:12 -05:00
R.I.Pienaar
4d1977b2c4 Merge pull request #25 from branan/module_package_name 
Fix module name to make the PMT happier
 2012-06-28 11:13:40 -07:00
Branan Purvine-Riley
6905d2ca91 Fix module name to make the PMT happier 2012-06-28 11:09:57 -07:00
R.I.Pienaar
6b725dd5e1 Merge pull request #24 from pabelanger/improvements 
Improvements
 2012-06-23 15:37:34 -07: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
Paul Belanger
ec1a465e50 Add Travis CI support 
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
 2012-06-23 17:15:47 -04:00
Paul Belanger
7d0b5709c9 Lets use puppetlabs_spec_helper 
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
 2012-06-23 17:13:08 -04:00
R.I.Pienaar
99f3eb83f7 Merge pull request #23 from sathlan/feature/add-basic-tests 
Feature/add basic tests
 2012-05-31 16:36:59 -07:00
sathlan
1fbe790b9a Cleanup. 2012-05-31 14:42:49 +02:00
sathlan
653444bd0a Adding basic tests. 
Successfully tested inside rvm:
  - ruby 1.8.7-p302;
  - puppet (2.7.13)
  - facter (1.6.9)
  - bundler (1.1.3)
  - diff-lcs (1.1.3)
  - metaclass (0.0.1)
  - mocha (0.11.4)
  - puppet-lint (0.1.13)
  - rake (0.9.2.2)
  - rspec (2.8.0)
  - rspec-core (2.8.0)
  - rspec-expectations (2.8.0)
  - rspec-mocks (2.8.0)
  - rspec-puppet (0.1.3)
  - rubygems-bundler (1.0.2)
  - rvm (1.11.3.3)
 2012-05-31 14:31:43 +02:00
R.I.Pienaar
52d5f36c75 Merge branch 'master' of github.com:ripienaar/puppet-concat 2012-05-29 19:30:35 +01:00
R.I.Pienaar
1c0e725ba7 Merge pull request #21 from mrwacky42/basedir_warning 
Fail with helpful advice if $::concat_basedir is not yet set
 2012-05-23 14:42:14 -07: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
R.I.Pienaar
52dbf4a61a Merge pull request #20 from endemics/master 
add information about concat_basedir and the need for pluginsync = true at least once
 2012-05-20 11:29:21 -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
R.I.Pienaar
12f38d86ee add files needed for the module forge 2012-04-30 10:45:08 +01:00
R.I.Pienaar
e9c97b8820 Merge pull request #18 from dalen/master 
A patch to make puppet-concat better comply with community style guidelines.
 2012-04-24 08:01:43 -07: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
R.I.Pienaar
b4a80d4655 Merge pull request #17 from pdxcat/refactor_remove_gnuflag 
Remove the gnu parameter from concat
 2012-04-17 12:08:05 -07: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
R.I.Pienaar
bd21154fa0 Merge pull request #12 from mrwacky42/master 
Unset silly Nexenta environment variable.
 2011-12-13 22:56:07 -08:00
Sharif Nassar
9dac53afc8 Remove silly environment variable that corrupts reality. 
Not sure how this is set in our puppet environment, but it is.
http://nexenta.org/projects/site/wiki/Personalities
 2011-12-13 20:24:10 -08:00
R.I.Pienaar
61c8d5c75b Merge pull request #11 from cwarden/fully-qualify 
Fix use of unqualified variable names
 2011-12-06 09:11:59 -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
R.I.Pienaar
0cd6bacfc9 Merge pull request #8 from duritong/master 
use client's vardir - make module usable for unprivileged users
 2011-08-03 06:44:57 -07:00
Peter Meier
185adddae8 Merge remote-tracking branch 'ripienaar/master' 2011-08-03 14:27:37 +02:00
R.I.Pienaar
4a08cd40b5 Merge pull request #10 from mediatemple/master 
Fix for /bin/sh on Solaris.
 2011-07-12 01:35:11 -07:00
Sharif Nassar
4dff5634b3 On Solaris, 'test -a' does not work with /bin/sh 
-a file                 True if file exists. (Not  available
                             in sh.)
 2011-07-11 16:54:20 -07:00
R.I.Pienaar
103504b310 Merge pull request #5 from TimBaldoni/master 
updated to better support dash
 2011-06-23 15:20:24 -07: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
Peter Meier
cfda8dd6ac Merge remote-tracking branch 'tim/master' 2011-06-23 10:17:32 +02:00