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

178 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ashley Penney
4ff6aa5716 Merge pull request #106 from jhoblitt/system_test_cleanups 
minor system test cleanups
 2013-11-14 09:59:11 -08:00
Ashley Penney
f9edb94b20 Merge pull request #105 from jhoblitt/system_test_isolation 
clean up between system spec files
 2013-11-14 09:58:53 -08:00
Joshua Hoblitt
4ee4be00ac minor system test cleanups 2013-11-13 20:28:27 -07:00
Joshua Hoblitt
c852dc22d7 clean up between system spec files 2013-11-13 17:56:47 -07:00
Joshua Hoblitt
911bb65b78 Merge pull request #104 from dreamlibrarian/fix/fragment-source-test 
Test concat::fragment for source => [] compatibility.
 2013-11-13 16:32:31 -08:00
Tristan Smith
499f338ce5 put the shell() calls into before{} blocks so that they're executed meaningfully. Testing to make sure a file doesn't exist shouldn't be as much of a hack as that is. I'm obviously missing something in the framework, but this works. 2013-11-13 14:23:30 -08:00
Tristan Smith
6c687551d8 Initial pass at test to ensure fragments accept and properly handle the underlying file source attribute. 2013-11-13 11:31:56 -08:00
Ashley Penney
5b9ed7093a Merge pull request #103 from jhoblitt/fragment_source 
allow source param to concat::fragment to be a string or an Array
 2013-11-13 05:26:01 -08:00
Joshua Hoblitt
ba9501c1a0 allow source param to concat::fragment to be a string or an Array 
This is resolve a regression preventing an array of string(s) being passed to the fragment file resource's source parameter.
 2013-11-12 23:20:48 -07:00
Ashley Penney
527c266997 Merge pull request #101 from jhoblitt/travis_matrix 
update travis matrix
 2013-11-12 09:29:45 -08:00
jhoblitt
9025ab41fd update travis matrix 
- peg the oldest tested version at puppet 2.7.3 + facter 1.6.0,
  primarily to try to catch the class param dangling comma issue that
  effects older versions of puppet
- let the newest version of puppet 3.x free float
 2013-11-12 05:19:08 -07:00
Joshua Hoblitt
f2bdcb0495 Merge pull request #100 from xepa/puppet_2_6_x_compat 
Puppet 2.6.x compatibility fix
 2013-11-12 04:09:22 -08:00
Michiel Brandenburg
2ef05a73fe Puppet 2.6.x compatibility 2013-11-12 11:36:34 +01:00
Joshua Hoblitt
8695e7ff63 Merge pull request #96 from jhoblitt/fact_tests 
add tests for concat_basedir fact
 2013-11-03 10:58:26 -08:00
Joshua Hoblitt
2236733267 Merge pull request #98 from jhoblitt/deprecation_warnings 
add rspec-puppet pending test for warning on inclusion of concat::setup
 2013-11-03 10:56:33 -08:00
Joshua Hoblitt
8f53c479cb add rspec-puppet pending test for warning on inclusion of concat::setup 2013-11-03 11:26:09 -07:00
Joshua Hoblitt
9371ae9517 Merge pull request #97 from jhoblitt/fact_whitespace 
convert from 4 space to 2 space indent
 2013-11-03 10:04:30 -08:00
Joshua Hoblitt
41695bd627 convert from 4 space to 2 space indent 2013-11-03 11:02:00 -07:00
Joshua Hoblitt
a08709caf7 add tests for concat_basedir fact 2013-11-03 10:20:32 -07:00
Ashley Penney
0580e3f2a0 Merge pull request #95 from jhoblitt/fragment_params 
deprecate concat::fragment mode, owner, & group params
 2013-11-02 15:45:03 -07:00
Joshua Hoblitt
1a926b933c deprecate concat::fragment mode, owner, & group params 
There's no need to allow the ownership/permissions of a fragment to be set as
the concat define sets ownership/permissions on the final aggregated file.
 2013-11-02 13:39:12 -07:00
Ashley Penney
7437a68016 Merge pull request #91 from jhoblitt/exec_as_root_when_root 
always exec the concatfragments script as root when running as root
 2013-11-02 13:14:51 -07:00
Ashley Penney
9c6378a78c Merge pull request #93 from jhoblitt/tidyups 
Tidyups
 2013-11-02 13:14:00 -07:00
Ashley Penney
7db163cd64 Merge pull request #94 from jhoblitt/symbolic_names 
allow concat::fragment target param to be an arbitrary string
 2013-11-02 13:13:08 -07:00
Joshua Hoblitt
79352f4da6 allow concat::fragment target param to be an arbitrary string 
Revert validation of the target param as an absolute path and allow it to be an
arbitrary string.  This is so the

    concat { <foo>: path => ...  }
    concat::fragment { ...: target => <foo> }

association may be symbolic as long as concat path param is specified.  This
should resolve the symbolic name regression introduced in:
https://github.com/puppetlabs/puppetlabs-concat/commit/eaf84079
 2013-11-02 09:33:41 -07:00
Joshua Hoblitt
b6e9b1c693 fix or suppress all lint warnings 2013-11-01 18:52:59 -07:00
Joshua Hoblitt
e3b8452055 rename README.markdown -> README.md 
For better consistency with other PuppetLabs' modules
 2013-11-01 18:32:26 -07:00
Joshua Hoblitt
c73b019226 remove dead files 2013-11-01 18:32:02 -07:00
Joshua Hoblitt
256e0bdf9f remove usage of resource defaults for file owner/permissions 
In addition, the permissions of the fragment directory and files is now fixed and not world readable.
 2013-11-01 18:23:24 -07:00
Joshua Hoblitt
200e4ee205 always exec the concatfragments script as root when running as root 
This is to allow the concatfragments script to be installed into a path that may not be accessible by a non-root user.
 2013-11-01 18:23:24 -07:00
Ashley Penney
99250ed5f8 Merge pull request #90 from jhoblitt/deprecation_warnings 
add deprecation warnings on removed parameters + warn on inclusion of co...
 2013-11-01 10:25:45 -07:00
Joshua Hoblitt
7c4f929e42 add deprecation warnings on removed parameters + warn on inclusion of concat::setup 2013-10-30 22:06:02 -07:00
Joshua Hoblitt
4de578da6e Merge pull request #79 from luisfdez/feature/windows-support 
Add Windows support
 2013-10-29 06:41:56 -07:00
Luis Fernandez Alvarez
99384037d6 Removed duplicated opts.separator call in concatfragments.rb 2013-10-28 09:03:30 +01:00
Luis Fernandez Alvarez
b09be245d4 Add Windows support 
- It adds a ruby version of the bash script.
- Refactor setup.pp to include new variables.
- Generalizes command execution according to variables in setup.pp.
 2013-10-25 14:47:03 +02:00
Joshua Hoblitt
b3438848c3 Merge pull request #78 from Paulche/stable_sort 
Replace LANG => LC_COLLATE in concatfragments.sh
 2013-10-24 14:42:07 -07:00
Paul Chechetin
ac9bb8d853 Replace LANG => LC_ALL 2013-10-25 01:16:05 +04:00
Ashley Penney
771173b890 Merge pull request #86 from jhoblitt/remove_ancient_cleanup 
remove purging of /usr/local/bin/concatfragments.sh
 2013-10-24 09:51:18 -07:00
Joshua Hoblitt
2ec19b80f9 remove purging of /usr/local/bin/concatfragments.sh 
The hard coded path of `/usr/local/bin/concatfragments.sh` hasn't been
used for "a long time" so there's no reason to carry the cleanup around
any longer.
 2013-10-24 09:34:31 -07:00
Ashley Penney
23f1d3b994 Merge pull request #85 from jhoblitt/remove_default_ownership 
remove default owner/user and group values
 2013-10-24 09:29:00 -07:00
Joshua Hoblitt
aa0180d69a remove default owner/user and group values 
The use of $::id to set the default user/owner and group has caused
multiple bugs in the past, is incorrectly used to infer the egid,
introduces a dependency on the `id` fact, and provides no functionally
that can't be accomplished by passing `undef` or not setting the
respective params on the file & exec types.

A possible alternative would be to introduce a dep on the $::gid fact
but that would mean the entire module would depend on a version of
facter than hasn't shipped yet (unworkable) or to add a gid/egid fact
into this module (ugly).
 2013-10-24 08:48:37 -07:00
Ashley Penney
1ee9c5b98d Merge pull request #84 from jhoblitt/backup_less 
only backup target concat file + remove backup param from concat::fragme...
 2013-10-23 16:19:32 -07:00
Joshua Hoblitt
4d884d3242 only backup target concat file + remove backup param from concat::fragment 
Disable filebucket backup of all file resources except for the the
target file that's being concatenated.
 2013-10-23 15:42:44 -07:00
Ashley Penney
94cbeca231 Merge pull request #83 from jhoblitt/param_validation 
Param validation
 2013-10-23 12:29:47 -07:00
Joshua Hoblitt
b6ee7e40e5 compatibility fixes for ruby 1.8.7 / puppet 2.7 2013-10-23 12:18:09 -07:00
Joshua Hoblitt
89dc9a9f71 mv spec/defines -> spec/unit/defines 
To be more consistent with other PL modules
 2013-10-23 10:57:03 -07:00
Joshua Hoblitt
4d7a915766 use $owner instead of $id to avoid confusion with $::id 2013-10-23 10:55:05 -07:00
Joshua Hoblitt
86522e1eb2 make class concat::setup a private class 2013-10-23 10:55:05 -07:00
Joshua Hoblitt
cca9401844 remove puppet 0.24 support 
Introduction of stdlib functions makes support of puppet < 2.7
impractical.
 2013-10-23 10:55:05 -07:00
Joshua Hoblitt
6e554e1a26 add stdlib to rspec-system tests 2013-10-23 10:55:05 -07:00