summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | Merge branch 'maint/2.6.next/safe-pluginhandler' into 2.6.nextJesse Wolfe2010-12-132-1/+5
| | | |\ \ \ \
| | | | * | | | maint: restore plugin handler safetyJesse Wolfe2010-12-132-1/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous maintenance patch for this file didn't provide as strong of a guarantee of loading plugins as the code it replaced. This patch restores the extremely broad exception catching, but prevents mocha exceptions from being silently ignored.
| | | * | | | Merge branch 'ticket/2.6.next/5408' into 2.6.nextJesse Wolfe2010-12-108-139/+253
| | | |\ \ \ \
| | | | * | | | (#5408) Attributes can be both audited and managedJesse Wolfe2010-12-108-139/+253
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to both audit and manage an attribute. It introduces a new field on Event objects "historical_value", which is the value from state.yaml. The value from the RAL is written to state.yaml, and then the RAL is updated with the desired value. Paired-With: Nick Lewis <nick@puppetlabs.com> Paired-With: Matt Robinson <matt@puppetlabs.com>
| | | * | | | Merge branch 'maint/2.6.next/fix-silent-mocha-failures' into 2.6.nextJesse Wolfe2010-12-108-12/+13
| | | |\ \ \ \
| | | | * | | | maint: missing stubJesse Wolfe2010-12-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This missing stub was raising an exception that, in versions of Mocha less than 0.9.10, was coincidentally causing the method under test to behave as expected. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | maint: missing stubJesse Wolfe2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This missing stub was raising an exception that, in versions of Mocha less than 0.9.10, was mistaken for the exception that was being tested for. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | maint: missing line and filename stubsJesse Wolfe2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another missing stub exposed by Mocha 0.9.10
| | | | * | | | maint: Fully stub partially stubbed test.Jesse Wolfe2010-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was succeeding in versions of Mocha before 0.9.10, because the Mocha expectation exceptions were being incorrectly interpreted as if they were File Not Found exceptions.
| | | | * | | | maint: remove Puppet.settings stubsJesse Wolfe2010-12-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was stubbing Puppet.settings, instead of setting the values directly. Exceptions thrown by trying to read other settings were getting swallowed when running a version of Mocha older than 0.9.10. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | maint: test was expecting Catalog.find too few timesJesse Wolfe2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our code calls Catalog.find multiple times, but this stub did not allow that. The resulting error was silently ignored on versions of Mocha before 0.9.10 Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | maint: broken test not failing due to over-eager exception catchingJesse Wolfe2010-12-102-4/+2
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test was not testing what it claimed, but the failure exception was getting swallowed by an unnecessarily broad rescue match. Paired-With: Nick Lewis <nick@puppetlabs.com>
| | | * | | | Merge branch 'ticket/2.6.next/1757' into 2.6.nextJesse Wolfe2010-12-087-52/+22
| | | |\ \ \ \
| | | | * | | | Fix #1757 Change file mode representation to octalJesse Wolfe2010-12-087-52/+22
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the internal representation of a file's mode to a string instead of an integer. This simplifies the problem of displaying the value consistently throughout all of puppet.
| | | * | | | Merge branch 'ticket/next/5423' into 2.6.nextPaul Berry2010-12-061-5/+5
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * ticket/next/5423: Bug #5423: This moves the home directory property before the uid property, thus minimizing room for damage when usermod is in use.
| | | | * | | Bug #5423: This moves the home directory property before the uid property, ↵Jonathan Boyett2010-12-061-5/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | thus minimizing room for damage when usermod is in use.
| | | * | | Merge branch 'ticket/2.6.next/4943' into 2.6.nextNick Lewis2010-12-024-2/+170
| | | |\ \ \
| | | | * | | (#4943) Add puppet inspect applicationNick Lewis2010-12-024-2/+170
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "puppet inspect" will load the locally stored YAML catalog and record the current state of the audited properties in the catalog. It uses settings specified in the [agent] configuration section, and will send its inspect report to the specified server. Paired-With: Jesse Wolfe
| | | * | | Merge branch 'ticket/2.6.next/5261' into 2.6.nextMatt Robinson2010-12-022-22/+16
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5261: (#5261) Fix #5261 Don't escape Unicode characters in PSON
| | | | * | | (#5261) Fix #5261 Don't escape Unicode characters in PSONJesse Wolfe2010-12-022-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the escaping of valid UTF-8 sequences as "\uXXXX". This code was unreliable, as it relied on Iconv's ability to convert those codepoints between UTF-8 and UTF-16, but some versions of Iconv barf on some valid codepoints. Invalid UTF-8 sequences are still passed through unchanged. We believe that this is fine; if you are concerned about complience with the JSON standard, what we are doing is equivalent to: * interpreting binary files as Latin-1 encoded character sequences * JSON-encoding those characters according to RFC 4627 * outputting the JSON as Latin-1 This allows all raw binary files to be transmitted losslessly. Paired-With: Paul Berry <paul@puppetlabs.com>
| | | * | | | Merge branch 'maint/2.6.next/bogus_mongrel_daemonize_test' into 2.6.nextMatt Robinson2010-12-021-6/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * maint/2.6.next/bogus_mongrel_daemonize_test: maint: Remove bogus mongrel test
| | | | * | | maint: Remove bogus mongrel testMatt Robinson2010-12-021-6/+0
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why test that mongrel responds to daemonize? EVERYTHING responds to daemonize thanks to activesupport. Paired-with: Paul Berry
| | | * | | Merge branch 'ticket/2.6.next/5081' into 2.6.nextMatt Robinson2010-12-012-9/+0
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5081: [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always loading site.pp"
| | | * | | [#5081] Revert "Fix #4349 - Parsing with ignoreimport=true was always ↵Matt Robinson2010-12-012-9/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading site.pp" The fix for #4349 caused --parse-only not to detect syntax errors when --ignore-import was used by adding a return statement that bypassed the initial import: commit 760e418d254a8d2198d2c6eb466d783a5930ef47 def perform_initial_import + return if Puppet.settings[:ignoreimport] The problem that #4349 fixed was more generally fixed in commit 99c1019e1d3402ec8e476dc859d5aaef82ec4f69 for ticket #4798 so the return statement is no longer needed, so reverting the commit for #4349 does not reintroduce the problem of an import loop error when running puppet doc. Paired-with: Jesse Wolfe
| * | | | Merge branch 'ticket/next/5427' into nextMatt Robinson2010-12-145-247/+80
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/5427: (#5427) Using Propery::OrderedList for host_alias (#5427) Remove redundant testunit tests
| | * | | | (#5427) Using Propery::OrderedList for host_aliasStefan Schulte2010-12-144-42/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the propertyclass Puppet::Property::OrderedList to represent the list of host_aliases. This lets us remove the in_sync, should_to_s etc overrides. In the provider class the list is represented by a string (=no array) so there were a few changes necessary as well. Because Puppet::Property::List uses the specified delimiter when converting should values to strings, I changed the delimiter to a simple space instead a tab. This keeps messages produced by puppet in a nice format. The tests had to be changed to work with the new behaviour of host_aliases. There are a few additional tests as well.
| | * | | | (#5427) Remove redundant testunit testsMatt Robinson2010-12-141-205/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | These tests are now better tested in the specs. Paired-with: Nick Lewis
| * | | | Merge branch 'ticket/next/5393' into nextJesse Wolfe2010-12-072-0/+30
| |\ \ \ \
| | * | | | (#5393) Add "dataset" parameter to the zone providerDerek Olsen2010-12-072-0/+30
| |/ / / / | | | | | | | | | | | | | | | This patch extends the zone provider to support the inclusion of one or more datasets in a solaris zone. A dataset is an zfs filesystem that has been delegated from the global zone to the non global zone.
| * | | | Merge remote branch 'someword/feature/master/5391' into nextPaul Berry2010-12-063-2/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * someword/feature/master/5391: (#5391) Include additional zfs properties
| | * | | | (#5391) Include additional zfs propertiesDerek Olsen2010-11-243-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added the following zfs properties to the zfs provider :recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache Currently zfs users have to chain an exec to the zfs filesystem creation and the inclusion of these properties would allow puppet to set them natively.
| * | | | | Merge branch 'ticket/next/maint-require_spec_helper' into nextMatt Robinson2010-12-06434-436/+437
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/maint-require_spec_helper: maint: Use expand_path when requiring spec_helper or puppettest maint: Fix more order dependent test failures
| | * | | | | maint: Use expand_path when requiring spec_helper or puppettestMatt Robinson2010-12-06434-434/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a require to a relative path can cause files to be required more than once when they're required from different relative paths. If you expand the path fully, this won't happen. Ruby 1.9 also requires that you use expand_path when doing these requires. Paired-with: Jesse Wolfe
| | * | | | | maint: Fix more order dependent test failuresMatt Robinson2010-12-062-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b67f4c68503ca3abf0a55857da452e46fa75abd5 I fixed one place that was causing order dependent test failures in spec/unit/ssl/certificate_request_spec.rb, but missed another case that was causing a similar failure. To find all the order dependent failures with that file I ran the following bash script from the spec directory: for TEST in `find . -name "*.rb" -type f`; do spec $TEST unit/ssl/certificate_request_spec.rb > /dev/null 2>&1 if [[ $? != 0 ]]; then echo $TEST fi done Paired-with: Jesse Wolfe
| * | | | | Merge branch '2.6.x' into nextMatt Robinson2010-12-0228-40/+77
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: (#5304) Use internal_name rather than real_name for maillist provider Updated CHANGELOG and version for 2.6.4 Revert "(#5304) Use internal_name rather than real_name for maillist provider" Disable remote ralsh by default (#5424) Ship auth.conf as part of installing from source (#5304) Use internal_name rather than real_name for maillist provider Renamed Reductive to Puppet Manually Resolved Conflicts: lib/puppet/provider/maillist/mailman.rb
| | * | | | (#5304) Use internal_name rather than real_name for maillist providerNigel Kersten2010-12-011-5/+3
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've switched to using list_lists --bare which shows the internal_name rather than "real_name", which is the authoritative identifier. Doing this also means we have less output to scrub, so the code is simpler. Modified by Markus as-per discussion with Nigel. Signed-off-by: Nigel Kersten <nigel@puppetlabs.com>
| | * | | Updated CHANGELOG and version for 2.6.4James Turnbull2010-12-022-1/+10
| | | | |
| | * | | Revert "(#5304) Use internal_name rather than real_name for maillist provider"James Turnbull2010-12-021-5/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 779fea867a9e23ad48cd877a88756cc5792e9e0c.
| | * | | Disable remote ralsh by defaultPaul Berry2010-12-022-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the default auth.conf so that accesses to "/resource" are no longer allowed. This means that to use "puppet resource -H" you will need to configure the target machine to enable access to the "/resource" URLs.
| | * | | (#5424) Ship auth.conf as part of installing from sourceNigel Kersten2010-12-021-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --configdir which defaults to /etc/puppet Add --no-configs to suppress config file installation. We're only shipping auth.conf at this stage, but in the future we may start shipping other config files.
| | * | | (#5304) Use internal_name rather than real_name for maillist providerNigel Kersten2010-11-301-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've switched to using list_lists --bare which shows the internal_name rather than "real_name", which is the authoritative identifier. Doing this also means we have less output to scrub, so the code is simpler. Signed-off-by: Nigel Kersten <nigel@puppetlabs.com>
| | * | | Renamed Reductive to PuppetJames Turnbull2010-11-2922-24/+24
| | | | | | | | | | | | | | | | | | | | I swear I've done this before. *confused*
| * | | | Merge branch 'maint/next/test_order_failure' into nextMatt Robinson2010-12-021-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * maint/next/test_order_failure: maint: Restore a default value that can cause order dependent test failures
| | * | | | maint: Restore a default value that can cause order dependent test failuresMatt Robinson2010-12-021-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you ran two tests in the following order: spec spec/integration/network/server/webrick_spec.rb spec/unit/ssl/certificate_request_spec.rb You got the following test failure: Cannot save me; parent directory /dev/null/ssl/certificate_requests does not exist Paired-with: Paul Berry
| * | | | Merge branch 'ticket/next/5211' into nextMatt Robinson2010-12-022-1/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/5211: (#5211) Added patch and tests for checking the size of the arrary which is returned
| | * | | | (#5211) Added patch and tests for checking the size of the arrary which is ↵Steve Nielson2010-12-022-1/+30
| | |/ / / | | | | | | | | | | | | | | | returned
| * | | | Merge branch 'ticket/next/2495' into nextNick Lewis2010-11-302-1/+77
| |\ \ \ \
| | * | | | (#2495) Better value validation for sshkeyStefan Schulte2010-11-302-1/+77
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in the ticket it is not obvious that aliases do not belong in the resourcename but have to be specified with the property "host_aliases". On the puppet-user list I saw someone using this as a resource @@sshkey {"$fqdn,$hostname,$ipaddress": type => rsa, key => $sshrsakey, } Puppet will now write a correct entry to the know_hosts file, but when it rereads the file, the field $fqdn,$hostname,$ipaddress is split into name ($fqdn) and host_aliases ([$hostname,$ipaddress]). Since we dont find the resource the user specified, puppet will put the same key in the file over and over again. This patch adds a simple validation on resourcename.
| * | | | Merge branch 'maint/next/remove_save_delegation' into nextPaul Berry2010-11-3039-139/+115
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint/next/remove_save_delegation: Maint: Modified uses of indirector.save to call the indirection directly. Maint: Modified tests of indirector.save to call the indirection directly. Maint: Add a default value for key in Facts::NodeExpirer#save Maint: Moved auto-signing logic into an indirector extension Maint: Swap the order of arguments to Indirection#save
| | * | | | Maint: Modified uses of indirector.save to call the indirection directly.Paul Berry2010-11-3022-38/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change replaces calls to <model object>.save with calls to <model class>.indirection.save(<model object>). This makes the use of the indirector explicit rather than implicit so that it will be easier to search for all indirector call sites using grep. This is an intermediate refactor on the way towards allowing indirector calls to be explicitly routed to multiple termini. This patch affects production code.