summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* (#8489) Consistently use File::PATH_SEPARATORJosh Cooper2011-08-195-9/+11
| | | | | | | | | Puppet uses both colon and File::PATH_SEPARATOR in various places, which does not work on Windows, where File::PATH_SEPARATOR is a semi-colon. This commit changes the code and tests to consistently use File::PATH_SEPARATOR. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com> (cherry picked from commit 26ee468e8b963d63933d9a27a65d55510ff87618)
* (#8356) Specify setting type for colorJacob Helwig2011-08-191-2/+6
| | | | | | | | | | | | | Because we default the color setting to "false" on Microsoft Windows, the heuristics used to detect which type of setting we're using were getting confused, and mis-detected color as being a BooleanSetting rather than just a Setting. By specifying that color is a "Setting", we can skip the auto-detection, and avoid this problem entirely. Reviewed-by: Josh Cooper <josh@puppetlabs.com> (cherry picked from commit b84bdbf31bbb0c5d5501bf6f32a9c0d0dc6acc94)
* (#8268) Fix resource harness spec testsJosh Cooper2011-08-191-5/+9
| | | | | | | | | | | | The windows file type requires that the path start with either a drive letter or UNC style path. Also Ruby's File implementation on windows only supports 0644 and 0444 permission bits (it doesn't differentiate between group and other, and it doesn't know about the execute bit). This commit maps the path and permissions used in the test to sensible values when running on windows. Paired-with: Jacob Helwig <jacob@puppetlabs.com> (cherry picked from commit 06e0208ec34285e0749c366c8a12817044d7d513)
* (#8356) Color defaults to false on WindowsJosh Cooper2011-08-192-1/+11
| | | | | | | | | Windows consoles do not support ansi escape sequences for colorizing output. This commit changes the default setting of 'color' to false when the "microsoft_windows" feature is present. Paired-with: Jacob Helwig <jacob@puppetlabs.com> (cherry picked from commit d7d384ec0b7f28a8f0be20defcc2eebd0550aff0)
* Disable the master on Windows instead of blowing up with failed resourcesJacob Helwig2011-08-192-1/+8
| | | | | | | | | | | | | Running the Puppet master on Windows is not supported, so instead of failing with what can be cryptic error messages about failed resources we fail with an explicit error message about the master on Windows not being supported. This way a user isn't mistakenly given the impression that running a master on Windows will work, and they just have something mis-configured. Signed-off-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Max Martin <max@puppetlabs.com> (cherry picked from commit 3a70503b60f9fd51177df4e9267c5ac28b06fb2d)
* (#7581) Provide more detailed error message when missing gems on WindowsJacob Helwig2011-08-191-1/+9
| | | | | | | | | | | | | | | | | | Running Puppet on Windows requires the sys-admin, win32-process & win32-dir gems. If any of these gems were missing, Puppet would fail with the message "Cannot determine basic system flavour". When trying to determine if we are on Windows, we now warn with the message "Cannot run on Microsoft Windows without the sys-admin, win32-process & win32-dir gems: #{err}", where err is the normal ruby load error message stating which gem could not be loaded. We also only warn if the POSIX feature is not present. Signed-off-by: James Turnbull <james@puppetlabs.com> Signed-off-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Cameron Thomas <cameron@puppetlabs.com> (cherry picked from commit faf8a5c05f50d98835a1db05b96146618f485a04)
* Merge pull request #48 from ↵Matt Robinson2011-08-1897-374/+0
|\ | | | | | | | | daniel-pittman/maint/2.7.x/strip-incorrect-rights-statements Maint/2.7.x/strip incorrect rights statements
| * maint: remove inaccurate copyright and license statements.Daniel Pittman2011-08-1897-374/+0
| | | | | | | | | | | | | | | | | | | | | | For a while Luke, and other authors, injected a created tag, copyright statement, and "All rights reserved" into every new file they added to the Puppet project. This isn't really true, and we have a global license covering the code, so we have now stripped out all those old tags. Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
* | Merge pull request #49 from nfagerlund/maint/2.7.x/filebucket_type_and_wrappingMatt Robinson2011-08-183-16/+28
|\ \ | |/ |/| Maint/2.7.x/filebucket type and wrapping
| * Maint: Correct docs for filebucket type and file's backup parameternfagerlund2011-08-182-14/+24
| | | | | | | | | | | | | | There's a known bug that prevents remote filebucket resources from working unless you set path => false. Until this bug is fixed, the docs should reflect reality as she is played. This commit mentions the bug in both areas where it is relevant.
| * Maint: Fix line wrapping in create_resources functionnfagerlund2011-08-181-2/+4
|/ | | | | This is a cosmetic commit improving the line wrapping in the create_resources function's documentation string.
* Merge pull request #47 from ↵Daniel Pittman2011-08-181-10/+20
|\ | | | | | | | | nfagerlund/maint/2.7.x/create_resources_documentation Maint: Improve create_resources function's doc string
| * Maint: Improve create_resources function's doc stringnfagerlund2011-08-171-10/+20
|/ | | | | | | The create_resources function's doc string was not particularly clear and had incorrect markdown formatting. This commit adds a more complete example which demonstrates the necessary hash format, and changes the doc string to a heredoc to simplify escaping.
* Merge remote-tracking branch 'josh/maint/2.7.x/ca-location-test-failures' ↵Nick Lewis2011-08-171-0/+4
|\ | | | | | | into 2.7.x
| * maint: Fix order dependent test failureJosh Cooper2011-08-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | The spec tests failed when running spec/unit/face/node_spec.rb followed by spec/unit/ssl/certificate_request_spec.rb, because the clean action for the node face was leaving Puppet::SSL::Host.ca_location set to :local instead of its default :none state. This commit resets the ca_location back to :none in the top-level after :all block.
* | Merge branch '2.6.x' into 2.7.xJacob Helwig2011-08-1711-188/+360
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: Reset indirector state after configurer tests. (#8770) Don't fail to set supplementary groups when changing user to root (#8770) Always fully drop privileges when changing user (#8662) Migrate suidmanager test case to rspec (#8740) Do not enumerate files in the root directory. (#3553) Explain that cron resources require time attributes Conflicts: lib/puppet/application/resource.rb test/puppet/tc_suidmanager.rb
| * \ Merge pull request #41 from jhelwig/do-not-leak-indirector-state-2.6.xDaniel Pittman2011-08-171-0/+5
| |\ \ | | | | | | | | Do not leak indirector state
| | * | Reset indirector state after configurer tests.Jacob Helwig2011-08-161-0/+5
| |/ / | | | | | | | | | | | | | | | | | | Because the indirector state persists across tests, we need to make sure that we clean up after ourselves whenever we explicitly set a non-default configuration. We now reset the terminus class after all the tests have run in the context with the modified configuration.
| * | Merge remote-tracking branch 'nicklewis/ticket/2.6.x/8770' into 2.6.xJacob Helwig2011-08-122-2/+32
| |\ \ | | | | | | | | | | | | | | | | * nicklewis/ticket/2.6.x/8770: (#8770) Don't fail to set supplementary groups when changing user to root
| | * | (#8770) Don't fail to set supplementary groups when changing user to rootNick Lewis2011-08-122-2/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, Puppet::Util::SUIDManager.change_user would always try to set supplementary groups (Process.initgroups) before changing its EUID. Process.initgroups requires the calling process to have EUID 0 in order to succeed. This worked fine in the case where the process was changing from root to a normal user, as it would set groups as root and then change EUID to 0. However, in the case where the process was changing back to root from a normal user, it would attempt to set groups as the normal user, and fail. Now, we check Process.euid before changing, and will set groups first if root, and will set euid first if not root. This ensures we can freely switch back and forth between root. This behavior is maintained inside of the change_user, rather than being broken into eg. raise_privilege and lower_privilege, because it is a relatively minor behavior difference, and the helper methods on their own would not have been generically useful.
| * | Merge remote-tracking branch 'nicklewis/ticket/2.6.x/8770' into 2.6.xJacob Helwig2011-08-114-174/+244
| |\ \ | | | | | | | | | | | | | | | | | | | | * nicklewis/ticket/2.6.x/8770: (#8770) Always fully drop privileges when changing user (#8662) Migrate suidmanager test case to rspec
| | * | (#8770) Always fully drop privileges when changing userNick Lewis2011-08-113-65/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X, it is only possible to directly change the euid of a process, and not the uid. Thus, when a puppet master started as root on OS X would change to the service user (puppet), it would leave the uid of its process set to 0. This allowed any type of Ruby plugin executed on the master (a type, provider, function, etc.) to trivially regain root privileges (by setting the euid of its process back to 0) and potentially compromise the master. Now, when permanently changing user, we will first try Process::UID.change_privilege, before falling back to setting the euid/uid ourselves. change_privilege correctly sets the uid of the process to the desired new uid, preventing the process from later escalating itself back to root. Similar behavior is also used when changing group. This has no effect on the behavior when temporarily changing user/group (for instance, to execute a single command or create a file as a particular user). Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | * | (#8662) Migrate suidmanager test case to rspecNick Lewis2011-08-112-120/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're trying to move away from the legacy Test::Unit tests, and toward rspec specs, so rewrite this file as specs. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| * | | Merge pull request #32 from ↵Nick Lewis2011-08-115-2/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | joshcooper/ticket/2.6.x/8740-cannot-manage-files-of-type-socket Ticket/2.6.x/8740 cannot manage files of type socket
| | * | | (#8740) Do not enumerate files in the root directory.Josh Cooper2011-08-115-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the command 'puppet resource file' would enumerate all files in the root directory, and generate an exception if the file type was not a directory, file, or link. Worse, it would also do this when a file or directory was specified, e.g. 'puppet resource file /etc/hosts'. Ideally, the find method of the ral terminus should not need to call the type's instances class method, instead just creating an instance of the type with the specified name and parameters. However, some types, like package, depend on this behavior. The type walks all providers and all instances that they provide, checking to see if the provider provides an instance with that name, and also warning if another provider provides an instance with the same name. Also, ideally, puppet should not blow up when encountering an unsupported file type, e.g. Unix domain socket, but that would be too big of a change for 2.6.x. This commit changes 'puppet resource file' to return a message saying that the operation is not supported: Listing all file instances is not supported. Please specify a file or directory, e.g. puppet resource file /etc The change is bit of a hack, as ideally, the file type's instances method could raise an exception when called in a 'search' context, but return an empty array in a 'find' context. But that also would be too big of a change for 2.6.x. This commit also adds spec tests for the resource application and file type, as well as an acceptance test, which creates a Unix domain socket in the root directory, while running 'puppet resource file'. Paired-with: Nick Lewis <nick@puppetlabs.com> Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
| * | | | Merge pull request #28 from nfagerlund/ticket/2.6.x/3553_cron_requires_timeDaniel Pittman2011-08-101-12/+13
| |\ \ \ \ | | |_|/ / | |/| | | Ticket/2.6.x/3553 cron requires time
| | * | | (#3553) Explain that cron resources require time attributesnfagerlund2011-08-101-12/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cron resource docs previously read, "All fields except the command and the user are optional, although specifying no periodic fields would result in the command being executed every minute." This was factually incorrect; instead, specifying no periodic fields results in a failure and an unhelpful error on Puppet 2.6 and 2.7. Although the issue will remain open as a behavior bug, this commit corrects the documentation of which attributes are required. It also changes the @doc string to a heredoc to simplify quote escaping.
* | | | Merge pull request #43 from domcleal/tickets/2.7.x/9039Daniel Pittman2011-08-171-2/+7
|\ \ \ \ | | | | | | | | | | (#9039) Update Augeas commands documentation
| * | | | (#9039) Update Augeas commands documentationDominic Cleal2011-08-171-2/+7
| | |_|/ | |/| | | | | | | | | | | | | | Added documentation on commands added as part of #6494 and clarified existing commands documentation.
* | | | Merge pull request #44 from ↵Michael Stahnke2011-08-171-11/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nfagerlund/ticket/2.7.x/8037_incorrect_augeas_example (#8037) Fix incorrect example in Augeas type reference
| * | | (#8037) Fix incorrect example in Augeas type referencenfagerlund2011-08-171-11/+12
|/ / / | | | | | | | | | | | | | | | | | | The changes attribute for the Augeas type's second example was incorrect, as it had leading slashes that took the paths out of the context of /files. This commit fixes the bad example, and changes the doc string to a heredoc to eliminate some messy escaping.
* | | Merge branch 'ticket/2.7.x/5495' into 2.7.xNick Lewis2011-08-161-3/+5
|\ \ \
| * | | Fix posix exec provider spec failures on WindowsNick Lewis2011-08-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These specs were assuming that paths such as /foo were always absolute, which is not the case on Windows. Thus, when run on Windows, the provider was complaining about receiving relative paths when it expected absolute, rather than succeeding or failing in the intended way. Now we expand all paths we want to be absolute, to guarantee they will be absolute everywhere. Also, some specs were failing because they were trying to test the case where a file isn't executable. That's not something we can reliably check on Windows, so instead just stub the appropriate executable? methods. Reviewed-By: Matt Robinson <matt@puppetlabs.com>
* | | | Merge branch 'ticket/2.7.x/5495' into 2.7.xNick Lewis2011-08-162-121/+120
|\| | |
| * | | (#5495) Remove dead Windows-specific code from posix exec providerNick Lewis2011-08-162-121/+120
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this provider only applies when the posix feature is present (and thus not the windows feature), it can never be used on Windows. Thus, the Windows-specific command handling is unnecessary and unused. Also added more specific error messages for the cases where a command doesn't exist, isn't a file, and isn't executable. These only apply when the command path is absolute (otherwise the message is simply command not found). Reviewed-By: Matt Robinson <matt@puppetlabs.com>
* | | Merge pull request #40 from jhelwig/fix-order-dependent-terminus-tests-in-2.7.xDaniel Pittman2011-08-163-8/+12
|\ \ \ | | | | | | | | Fix order dependent terminus tests in 2.7.x
| * | | Do not leak indirector state from apply testsJacob Helwig2011-08-153-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the indirector state persists across tests, we were seeing order dependent test failures with tests that assumed the default indirector settings. Specifically, if the following tests were run in order, the first would cause failures in the second two: spec/unit/application/apply_spec.rb spec/unit/node_spec.rb spec/integration/node_spec.rb To protect against this state leakage, we now: - reset the Puppet::Node terminus before each test in spec/integration/node_spec.rb to ensure we are testing a clean environment. - reset the Puppet::Node, and Puppet::Node::Facts terminus, and cache class after each test in spec/unit/application/apply_spec.rb to prevent leakage into other tests. Since the cache class has the same state leakage problem as the terminus class, but does not have the same ability to lazily populate the default when set to nil, we remove the test. Testing the default for the cache class would require running the test before all other tests to ensure there is no state pollution.n
* | | | Merge pull request #39 from nfagerlund/ticket/2.7.x/8612_exec_creates_parameterDaniel Pittman2011-08-161-7/+10
|\ \ \ \ | |/ / / |/| | | Ticket/2.7.x/8612 exec creates parameter
| * | | (#8612) Clarify the function of the example for exec's "creates" parameternfagerlund2011-08-151-7/+10
|/ / / | | | | | | | | | | | | | | | It was not clear to all readers that /var/tmp/myfile was being extracted from the tarball. This commit adds a sentence to make the conditions when the exec will run more explicit and fixes an error in the tar command.
* | | Merge pull request #22 from domcleal/tickets/2.7.x/8808Daniel Pittman2011-08-122-3/+19
|\ \ \ | | | | | | | | (#8808) Fail Augeas resource when unable to save changes
| * | | (#8808) Fail Augeas resource when unable to save changesDominic Cleal2011-08-062-3/+19
| | | | | | | | | | | | | | | | | | | | Raise a failure when Augeas changes cannot be saved (due to invalid layout of the tree, permissions etc). Fixes a regression.
* | | | Merge pull request #29 from nfagerlund/maint/2.7.x/minor_docs_fixesDaniel Pittman2011-08-102-30/+33
|\ \ \ \ | | | | | | | | | | Maint/2.7.x/minor docs fixes
| * | | | (#4411) Explain that runinterval = 0 does not mean "never run"nfagerlund2011-08-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike several other tools that accept a number of seconds between runs, puppet agent doesn't use 0 as a special value representing "never;" instead, it takes this as an instruction to run continuously. As this has caused some user confusion, this commit updates runinterval's description to explain this, and points to the correct method to make puppet agent do nothing.
| * | | | Maint: Fix missing option text in puppet agent and arrange options ↵nfagerlund2011-08-101-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alphabetically Puppet agent's man text was missing the --no-client option in its command synopsis, and the long text for --no-client cut off weirdly in the middle of a sentence. This commit fixes both problems, and arranges all the options alphabetically so they're easier to reference.
* | | | | Merge branch '2.6.x' into 2.7.xMatt Robinson2011-08-102-5/+17
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * 2.6.x: (#8302) Improve documentation of exec providers Add document outlining preferred contribution methods
| * | | | Merge pull request #26 from nfagerlund/ticket/2.6.x/8302_exec_provider_docsDaniel Pittman2011-08-102-5/+17
| |\ \ \ \ | | |_|_|/ | |/| | | Ticket/2.6.x/8302 exec provider docs
| | * | | (#8302) Improve documentation of exec providersnfagerlund2011-08-102-5/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | The documentation for the shell and posix providers didn't fully explain the differences between them or the security implications of each. This commit improves the documentation of both providers.
| * | | Add document outlining preferred contribution methodsJacob Helwig2011-08-021-0/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have historically had the preferred contribution process on the Redmine wiki, however this is not obvious to people that don't already know it is there. By adding this document to the repository itself, it becomes much easier for new contributors to find what the preferred contribution methods are. By having the preferred contribution method in the repository also means that it becomes a "curated" document, which must go through the same submission/review process that other changes to the repositories go through. Reviewed-by: Nick Fagerlund <nick.fagerlund@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com>
* | | | Merge pull request #24 from nfagerlund/maint/2.7.x/misc_doc_fixesJeff McCune2011-08-094-21/+32
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint/2.7.x/misc_doc_fixes' into 2.7.x * maint/2.7.x/misc_doc_fixes: (#7853) Clarify and complete docs for the tagmail report processor Maint: Mention that audit metaparameter will accept "all" Maint: Adjust wording for file type's content parameter Maint: Fix poor documentation for versioncmp function.
| * | | (#7853) Clarify and complete docs for the tagmail report processornfagerlund2011-08-091-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | The tagmail report docs did not mention that you could use log levels as tags, and was unclear in several other minor ways. This commit improves that documentation.
generated by cgit (git 2.34.1) at 2025-09-26 18:31:24 +0000