summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | Fixed #6002 - Added note about function executionJames Turnbull2011-01-251-0/+4
| | | | | | |
| | * | | | | Merge remote branch 'jamtur01/tickets/2.6.x/5736' into 2.6.nextJacob Helwig2011-02-011-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/5736: Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate description of --clean.
| | | * | | | | Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate ↵nfagerlund2011-01-171-2/+2
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | description of --clean.
| | * | | | | Merge branch 'tickets/2.6.x/5167' into 2.6.nextMatt Robinson2011-02-011-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.6.x/5167: Fixed #5167 - misleading documentation in the defaults of [main]
| | | * | | | | Fixed #5167 - misleading documentation in the defaults of [main]James Turnbull2011-01-171-2/+2
| | | |/ / / /
| | * | | | | Merge remote branch 'james/tickets/2.6.x/5742' into 2.6.nextJesse Wolfe2011-02-011-5/+6
| | |\ \ \ \ \
| | | * | | | | Fixed #5742 - Removed legacy fqdn option from documentationJames Turnbull2011-01-171-5/+6
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Patch from: Nick Fagerlund
| * | | | | | Merge branch 'bug/2.6.next/5755-yaml-backrefs' into 2.6.nextMarkus Roberts2011-02-012-29/+57
| |\ \ \ \ \ \
| | * | | | | | Augmentation of tests for prior commitMarkus Roberts2011-02-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no good answer to tests that depend on the order of itteration over hashes.
| | * | | | | | Fix to fix for #5755 -- backref serialization issues in zamlMarkus Roberts2011-02-012-28/+50
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit addresses the original issue that the change reverted in the previous commit for #5755 was intended to fix by removing the special case on labels in emit (lables, even if they are never generated, are not "new lines" and thus @recent_nl should always be set to false when one is emitted). It also partially addresses a related issue wherein temporary strings generated when field names are constructed recycle their object_id (they are temporary) and thus cause incorrect back references. This commit "fixes" the problem by never generating backrefs to strings (treating them as immutable). It does not address other suspected issues such as thread safety durring serialization due to the use of class variables to store the seen-object hash or the use of object ids as "permanently unique" identifiers. Paired with: Daniel Pittman Advice & Commiseration: Jesse Wolfe
| * / / / / / Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextMarkus Roberts2011-02-0154-232/+715
|/| | | | | | | |/ / / / /
| * | | | | Merge remote branch 'jamtur01/tickets/2.6.x/1657' into 2.6.nextJacob Helwig2011-02-011-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/1657: Fixed #1657 - Added note about target file
| | * | | | | Fixed #1657 - Added note about target fileJames Turnbull2011-01-171-1/+1
| | |/ / / /
| * | | | | Merge branch 'ticket/2.6.next/3165' into 2.6.nextPaul Berry2011-02-012-21/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * ticket/2.6.next/3165: Fix #3165 Ralsh (bin/puppet resource) can't manage files
| | * | | | Fix #3165 Ralsh (bin/puppet resource) can't manage filesJesse Wolfe2011-01-232-21/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on the patch submitted by Owen Smith. File management was being blocked by two problems: an obsolete, broken `instances` method for the file type, and a bug in the way resource/ral handled slashes in resource names. This patch makes two changes to Owen's version: 1) our unit tests caught an unexpected ruby quirk: "text/".split("/") and "text/".split("/", 2) do not return the same values. 2) File.instances now reproduces the old behavior of listing files in the root directory. This is now implemented in terms of the existing file recursion feature.
| * | | | Merge commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694' into 2.6.nextJacob Helwig2011-02-011-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694': Fixed #4968 - Updated list of options turned on by --test in documentation
| | * | | | Fixed #4968 - Updated list of options turned on by --test in documentationJames Turnbull2011-02-011-1/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | Merge branch 'feature/master/5061' into 2.6.nextPaul Berry2011-02-012-13/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * feature/master/5061: (#5061) - allow special hostclass/define variables to be evaluated as defaults.
| | * | | | (#5061) - allow special hostclass/define variables to be evaluated as defaults.Dan Bode2011-02-012-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have always been annoyed that special variables for defines and hostclasses can not be evaluated as param defaults. Special variables are: $name, $title, $module_name. Code example: class x ( foo = $name ) { notice($foo)} should print x, and with my patch, it does. Reviewed-by: Paul Berry <paul@puppetlabs.com>
| * | | | | Merge branch 'ticket/2.6.next/5045' into 2.6.nextMatt Robinson2011-02-014-15/+147
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/5045: (#5045) Cleaning up some tests and code (#5045) External node classifiers should be able to specify params for classes (#5045) Adds support to resource/type to also accept a param hash
| | * | | | | (#5045) Cleaning up some tests and codeMatt Robinson2011-01-244-40/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed some variables to be clearer, made tests use less stubbing, added some additional tests and got rid of some unecessary logic. Paired-with: Dan Bode
| | * | | | | (#5045) External node classifiers should be able to specify params for classesDan Bode2011-01-242-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It facilitates the support for param classes from the ENC. It adds support for classes to be passed as a hash to the evaluate_classes method. If a hash of classes is specified, it also evaluates duplicates. I also had to convert the hash to an array for tags to be applied correctly. Reviewed-by: Matt Robinson
| | * | | | | (#5045) Adds support to resource/type to also accept a param hashDan Bode2011-01-242-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The params are added as attributes when the resource is created. Also, even if the class already exists, if params are passed, we still try to create it. Reviewed-by: Matt Robinson
| * | | | | | Merge branch 'tickets/2.6.x/2096' into 2.6.nextMatt Robinson2011-02-011-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * tickets/2.6.x/2096: Fixed #2096 - clarified option modification and tested it is working
| | * | | | | Fixed #2096 - clarified option modification and tested it is workingJames Turnbull2011-01-171-2/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'ticket/2.6.next/6107' into 2.6.nextMatt Robinson2011-02-013-0/+63
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6107: (#6107) Fix an error when auditing a file with empty content
| | * | | | | (#6107) Fix an error when auditing a file with empty contentMatt Robinson2011-02-013-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The manifest: file { "/tmp/foo" : ensure => present, audit => content, } produced the error: err: /Stage[main]//File[/tmp/foo]/ensure: change from absent to present failed: Could not retrieve content for from filebucket: private method `sub' called for nil:NilClass at /Users/matthewrobinson/work/puppet/test.pp:4 This was due to logic in content assuming that if you didn't specify content while you were auditing it you must have specified a source. The code paths in the file type badly need a cleanup so that these sorts of errors aren't so difficult to track down and things are easier to test. Paired-with: Daniel Pittman
| * | | | | | Merge branch 'issues/2.6.next/5566' into 2.6.nextJacob Helwig2011-02-011-2/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * issues/2.6.next/5566: Remove already initialized constant warning from file_spec.rb tests
| | * | | | | | Remove already initialized constant warning from file_spec.rb testsJacob Helwig2011-02-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rspec pulls constants from the implementation into the test, so we don't need to redefine it. Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | | | Merge branch 'issues/2.6.next/5566' into 2.6.nextJacob Helwig2011-02-015-7/+109
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * issues/2.6.next/5566: (#5566) Treat source only File checksums as syntax errors when used with content Rename variable used in File type validation to be more clear Remove invalid "timestamp" and "time", and add missing "ctime" File checksum types. Remove order dependency when specifying source and checksum on File type
| | * | | | | | (#5566) Treat source only File checksums as syntax errors when used with contentJacob Helwig2011-02-013-1/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain checksum types (ctime, mtime) only make sense when used with the 'source' File parameter, since there is no way to check them on raw strings. Given the limitations of the current checksumming implementations, it is likely to introduce unexpected behavior when using the 'none' checksum type and either one of the 'source', and 'content' File parameters. Because of this, it is now a syntax error to use a checksum of 'none' with either parameter. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | * | | | | | Rename variable used in File type validation to be more clearJacob Helwig2011-02-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'count' variable is used to keep track of how many 'creator' parameters are set on the Type in order to raise an exception if this is greater than one. Be explicit about this. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | * | | | | | Remove invalid "timestamp" and "time", and add missing "ctime" File checksum ↵Jacob Helwig2011-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types. 'timestamp', and 'time' have been invalid since well before 2.6.0, so do not add them to the list of valid checksum types. 'ctime' was missing from the list of valid checksum types, so add it. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| | * | | | | | Remove order dependency when specifying source and checksum on File typeJacob Helwig2011-02-012-1/+15
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If source was specified after setting the checksum, it would cause the checksum to be set back to :md5. This was completely unnecessary, because the checksum has its own default of :md5. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
| * | | | | | Merge remote branch 'jamtur01/tickets/2.6.x/3646' into 2.6.nextPaul Berry2011-02-011-0/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * jamtur01/tickets/2.6.x/3646: Fixed #3646 - Added documentation for compile and apply to man page
| | * | | | | Fixed #3646 - Added documentation for compile and apply to man pageJames Turnbull2011-01-211-0/+9
| | |/ / / /
| * | | | | Merge branch 'bug/2.6.next/5755' into 2.6.nextDaniel Pittman2011-01-312-4/+24
| |\ \ \ \ \
| | * | | | | Bug #5755 -- ZAML generates extra newline in some hash backreferences.Daniel Pittman2011-01-312-4/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This data structure generates YAML with an extra newline that violates the syntax rules and all: list = [1] { :a => list, :b => list }.to_yaml This breaks real client use of the YAML catalogs, not to mention our own use of cached catalogs...
| * | | | | Merge branch 'bug/2.6.next/5681-aix-mount-output' into 2.6.nextDaniel Pittman2011-01-314-1/+18
| |\ \ \ \ \
| | * | | | | bug #5681 -- code fix to handle AIX mount outputRick Bradley2011-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Making a simplified fix to find mount name in AIX mount command output.
| | * | | | | Bug #5681 -- parse AIX mount command output.Daniel Pittman2011-01-312-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modified the Puppet::Provider::Mount (lib/puppet/provider/mount.rb) to parse AIX mount command output - Modified lib/puppet/type/mount.rb to set remount to false by default in AIX and fix small typo
| | * | | | | Spec for #5681 to allow parsing of AIX mount output in mount providerRick Bradley2011-01-312-0/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This also adds a fixture file containing the AIX mount output as submitted by the ticket author.
| * | | | | Merge branch 'bug/2.6.next/6091-multiple-slashes-in-path-are-legal' into ↵Daniel Pittman2011-01-312-1/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 2.6.next
| | * | | | | Fixed #6091 - Changed POSIX path matching to allow multiple leading slashesJames Turnbull2011-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_266: "Multiple successive slashes are considered to be the same as one slash.", so '//tmp/xxx' is a valid POSIX pathname. Thomas Bellman adds: You should probably read section 3.2 then as well: 3.2 Absolute Pathname A pathname beginning with a single or more than two slashes; see also Pathname. Note that a pathname starting with exactly two slashes is *not* an absolute pathname according to Posix. And 4.11 (Pathname Resolution) says: A pathname that begins with two successive slashes may be interpreted in an implementation-defined manner, although more than two leading slashes shall be treated as a single slash. Posix has this rule to accomodate DomainOS, which was a Unix- like OS from Apollo, where paths on the form "//foo/bar/gazonk" meant the file "/bar/gazonk" on the machine named "foo". You may recognize this format from URLs, or MS Windows SMB paths (with backslashes instead of forward slashes). This ignores that complication, since none of our supported platforms treat the '//' form as significant. Signed-off-by: James Turnbull <james@lovedthanlost.net> Signed-off-by: Daniel Pittman <daniel@puppetlabs.com> Signed-off-by: Rick Bradley <rick@rickbradley.com>
| | * | | | | Bug #6091 -- test leading double-slash in filenames are allowed.Daniel Pittman2011-01-311-0/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | They presently are not; this ensures that we verify that before merging a change that fixes bugs in the area.
| * | | | | Merge branch 'bug/2.6.next/6061-password-max-age' into 2.6.nextDaniel Pittman2011-01-282-2/+30
| |\ \ \ \ \
| | * | | | | Fixed #6061 - Allowed -1 as password min/max ageJames Turnbull2011-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows setting disabling password aging on Linux and Solaris Signed-off-by: James Turnbull <james@lovedthanlost.net>
| | * | | | | Bug #6061 -- verify that negative {min,max}_password_age are accepted.Daniel Pittman2011-01-281-0/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the age value to -1 will disable the specific aging value; we should accept that, but continue to reject null or empty values as invalid. Add tests to verify that this code enforces as expected.
| * | | | | Merge branch 'bug/2.6.next/5855-freebsd-withenv' into 2.6.nextDaniel Pittman2011-01-262-2/+57
| |\ \ \ \ \
| | * | | | | Feature #5855 -- fix withenv call in freebsd package providerfredrik-eriksson2011-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qualify 'withenv' in the provider, since it is part of an entirely different part of puppet, not a method on this provider. This closes #5855. Signed-off-by: fredrik-eriksson <fredrik.eriksson@loopia.se> Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>