summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-02Merge remote-tracking branch 'shared/master'HEADmastermh
2012-12-12Merge pull request #38 from jpoppe/masterR.I.Pienaar
added (file) $replace parameter to concat
2012-12-12added description of replace in the comment blockJasper Poppe
2012-12-12added (file) $replace parameter to concatJasper Poppe
2012-11-06Merge pull request #35 from Zugschlus/masterR.I.Pienaar
please consider pulling
2012-11-06gracefully handle \n in fragment resource nameMarc Haber
2012-11-06refer to manifest files for option docsMarc Haber
2012-09-04fix markupR.I.Pienaar
2012-09-04Prepare for version 0.2.0R.I.Pienaar
2012-08-30Merge pull request #32 from UnifiedPost/developR.I.Pienaar
Fixes various puppet-lint warnings.
2012-08-30Fixes various puppet-lint warnings.Jan Vansteenkiste
* ./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-30Merge pull request #31 from UnifiedPost/developR.I.Pienaar
Allow using a custom name and provide a path to the file that needs to be created using concat.
2012-08-30Document the path parameter and provide a small use case.Jan Vansteenkiste
2012-08-30Add a second spec test for the name/path combinationJan Vansteenkiste
2012-08-30Allow overriding the target path of a (concat) file and use a custom name.Jan Vansteenkiste
2012-08-14Merge pull request #29 from x-way/masterR.I.Pienaar
Add puppet-lint and rspec-puppet gems to make Travis CI work again
2012-08-14Add puppet-lint and rspec-puppet gem for Travis CIAndreas Jaggi
2012-08-14Merge pull request #28 from x-way/masterR.I.Pienaar
Remove trailing whitespace to make puppet-lint happy
2012-08-14Remove trailing whitespace in commentAndreas Jaggi
puppet-lint does not like trailing whitespaces
2012-07-11Merge pull request #27 from djmitche/auto-setupR.I.Pienaar
Include concat::setup from concat, so users don't need to
2012-07-11Include concat::setup from concat, so users don't need toDustin J. Mitchell
2012-07-11Merge pull request #26 from djmitche/patch-1R.I.Pienaar
Remove spurious 'e' character.
2012-07-11Remove spurious 'e' character.Dustin J. Mitchell
2012-06-28Merge pull request #25 from branan/module_package_nameR.I.Pienaar
Fix module name to make the PMT happier
2012-06-28Fix module name to make the PMT happierBranan Purvine-Riley
2012-06-23Merge pull request #24 from pabelanger/improvementsR.I.Pienaar
Improvements
2012-06-23Reformatting for puppet-lintPaul Belanger
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-23Add Travis CI supportPaul Belanger
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-23Lets use puppetlabs_spec_helperPaul Belanger
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
2012-06-20update README.markdown to clearly indicate how to start using the concat moduleMicah Anderson
2012-05-31Merge pull request #23 from sathlan/feature/add-basic-testsR.I.Pienaar
Feature/add basic tests
2012-05-31Cleanup.sathlan
2012-05-31Adding basic tests.sathlan
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-29Merge branch 'master' of github.com:ripienaar/puppet-concatR.I.Pienaar
2012-05-23Merge pull request #21 from mrwacky42/basedir_warningR.I.Pienaar
Fail with helpful advice if $::concat_basedir is not yet set
2012-05-23Fail with helpful advice if $::concat_basedir is not yet setSharif Nassar
Building on the new docs in https://github.com/ripienaar/puppet-concat/pull/20
2012-05-20Merge pull request #20 from endemics/masterR.I.Pienaar
add information about concat_basedir and the need for pluginsync = true at least once
2012-05-20add information about concat_basedir and the need for pluginsync = true at ↵Gildas Le Nadan
least once
2012-04-30add files needed for the module forgeR.I.Pienaar
2012-04-24Merge pull request #18 from dalen/masterR.I.Pienaar
A patch to make puppet-concat better comply with community style guidelines.
2012-04-24Style guideline fixesErik Dalén
Comply better with puppet community style guidelines. Change-Id: Ie1782d266539b1a8f9890b2ade77280011aa22aa
2012-04-17Merge pull request #17 from pdxcat/refactor_remove_gnuflagR.I.Pienaar
Remove the gnu parameter from concat
2012-04-17Remove the gnu parameter from concatReid Vandewiele
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.
2011-12-14Fix comments to match actual behavior, clean up old script.Sharif Nassar
* Zap the old copy of /usr/local/bin/concatfragments.sh. * Fix comments to point at new location of script. * Delete trailing whitespace.
2011-12-13Merge pull request #12 from mrwacky42/masterR.I.Pienaar
Unset silly Nexenta environment variable.
2011-12-13Remove silly environment variable that corrupts reality.Sharif Nassar
Not sure how this is set in our puppet environment, but it is. http://nexenta.org/projects/site/wiki/Personalities
2011-12-06Merge pull request #11 from cwarden/fully-qualifyR.I.Pienaar
Fix use of unqualified variable names
2011-12-05Fix use of unqualified variable namesChristian G. Warden
Fully qualify $::id, $::puppetversion, and $::concat_basedir.
2011-08-03Merge pull request #8 from duritong/masterR.I.Pienaar
use client's vardir - make module usable for unprivileged users
2011-08-03Merge remote-tracking branch 'ripienaar/master'Peter Meier