| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
In Red Hat bug #531116 Ruben Kerkhof noted that we weren't using the
--pidfile $pidfile option to daemon. This caused 'service puppet start'
to fail if puppet had already been started. To be consistent, we now
pass the pidfile option to daemon, killproc, and status when those
functions provide such an option. And we only test for the availability
of the -p/--pidfile option in one place.
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
When onetime was moved to global defaults, it broke the option handler
using it in agent to manage waitforcert length. Additionally, it
caused --onetime and -o to behave differently. This patch removes
the ordinary option handler defined in agent and moves the logic
for waitforcert to the one location it's used.
|
| | |
| |
| |
| |
| |
| | |
My previous fix for #3656 missed the case where a "require" attribute
(or other graph-ish attribute) had multiple values. This patch
generalizes that fix to the multiple-value case.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This came up because if you ran puppetd with a specific vardir, then
when rundir got set to a hardcoded value its parent directory might not
exist and the whole thing would fail.
This change came about with the concept of run_mode, and this fix is
restoring the behaviour that was in 0.25.x
Reviewed-by: Jesse Wolfe
Signed-off-by: Matt Robinson <matt@puppetlabs.com>
|
| | |
| |
| |
| |
| |
| | |
The module init loading was broken in 7504f1e..b938edf and then gradually
removed as dead code. This is a minimal (and mildly ugly) reinsertion os it
with the addition of .rb support.
|
| |/|
| |
| |
| |
| |
| | |
This is a housekeeping merge: all 0.25.x commits were already
cherry-picked into the 2.6 era's master.
No code was changed by this merge, since I used --strategy=ours
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
- Dropped the forced --manifest switch in the
suse startup script to allow for environments
to re-define this. Otherwise, environments will
not work as puppet override configuration with
command line arguments.
|
| | | |
|
| | |
| |
| |
| |
| | |
This way the test can be evaluated lazily when needed. Adds tests and
documentation.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
confines are not inherited by inner define blocks. For instance:
describe "something" do
confine "can not has" => false
describe "something else"
... this will still be run ..
end
end
This fixes the specific describe block that is lacking the necessary
confine, allowing specs to run again while we fix the bug in confine
itself.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* defaults to "facter"
* no longer set the facts terminus class in for puppetmaster, use
setting instead
Implements an abstract CouchDB terminus and a concrete CouchDB terminus
used to store node facts. Node facts are stored in a "node" document as
the "facts" attribute. This node document may also be used by other
couchdb termini that store node-related information. It is recommended
to use a separate document (or documents) to store large data structures
like catalogs, linking them to their related node document using
embedded ids.
This implementation depends on the "couchrest" gem.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the cache
Running puppetd with --use_cached_catalog you would see messages like:
info: Not using expired catalog for mattmac.local from cache
notice: Using cached catalog
Both Puppet::Util::Cacher, which extends catalogs, and Puppet::Indirector::Envelope,
which extends all Indirection objects including catalogs, have their own cache
expiring mechanisms. The Envelope mechanism was declining to use cached
catalogs without taking into account what the --use_cached_catalog
options said. This patch fixes so it uses the cached catalog and just logs:
debug: Using cached catalog for mattmac.local
This commit also renames a method that makes requests from request
to instantiate request, and gets rid of the extender hook on Cacher
since it was only being used on one test and probably shouldn't be used
in general.
Reviewed by: Nick Lewis
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
parent doesn't exist
This was giving the regular File.open error for non-existent parent, resulting
in a message citing the non-existence of the file as the reason ensure can't be
changed from absent to present. Now it properly states that the parent
directory is missing.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Children of recursively absent (and only recursively absent) directories now
inherit the recursively absent behavior when they are created. This stops the
files from trying to be created, generating lots of failure messages. This
doesn't affect directories which are absent and not recursive (whose children
aren't even attempted to be created, or directories which aren't absent.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A new version of Rack::MockRequest automatically uppercases the HTTP
method, expecting that any method passed in should properly be uppercase.
e.g. GET, PUT, POST
This behavior is on line 81 of Rack::MockRequest:
http://rack.rubyforge.org/doc/classes/Rack/MockRequest.src/M000230.html
Reviewed by Matt Robinson
|
| | |
| |
| |
| |
| | |
Puppetdoc got confused because it wasn't popping the comment context for
collections and resource defaults. This commit adds the popping.
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
When Markus reverted changes made by 2890 he reintroduced a
method certificate_matches_key? that then caused failures in
network/xmlrpc/client.rb. I just stubbed that method to return true
since the failing tests weren't trying to test that methods behavior.
Reviewed-by: Markus Roberts
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
deprecation warnings from Rails ActiveSupport
The metaid.rb file came straight from why the lucky stiff's "seeing
metaclasses clearly" article. Rails used this too, but they recently
deprecated the name metaclass in favor of singleton_class to match what
ruby-core decided to do. meta, eigen and singlton class were all
suggested and in the end singleton was agreed upon.
http://redmine.ruby-lang.org/issues/show/1082
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Ideally it would be nice if the rake task used personalized RSpec
settings on a per user basis, but until someone figures that out color
would be nice
Signed-off-by: Matt Robinson <matt@puppetlabs.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There are several issues with changing the real, effective, and saved group
and user ids in different environments (which methods to call, in what order,
etc). While the code being replaced by this patch appeared to work for Linux,
Solaris, and (with a special case test) Darwin; it was failing under AIX and
may have had edge-case problems under the others.
Ruby back to 1.8.1 has supported a higher level interface that deals with the
problem and captures a broader range of OSes; it's a single call for group and
one for user--the details of rid/eid/svid, etc ordering are handled internally.
Switching to that simplifies our code and should improve/unify our support of
various OSes.
|
| | |
| |
| |
| | |
Adds a --signed option to the --list feature that only displays signed certificates
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Conflicts:
lib/puppet/ssl/host.rb
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was caused by a conflict between our yaml post processing
(which expects the malformed output of the standard library's yaml
class) and zaml (which produces the right output).
This patch implements the minimal footprint solution. It just causes
zaml to always escape \r and \n, so that the fixups won't be triggered
and the results will be properly interpreted by any version of puppet.
For Rowlf, this patch should NOT be used, and instead the fix for #3766
(actually rooting out and removing the vestigial fixups) should be used.
Signed-off-by: Markus Roberts <Markus@reality.com>
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
With RHEL-6 just around the corner, now is also a good time to adjust
the ruby(selinux) conditional to work there. The rundir-perms patch
from tarball is applied rather than including it separately in the SRPM.
It makes for one less file to track in downstream distros. Other minor
changes are pulled in from the Fedora/EPEL spec file.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's really slow and has no actual functionality
any more, since we just remove the catalogs from memory
anyway.
This should be a good speed boost for very little effort.
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The semantic interaction of tidy/matches and tidy/recurse is tricky to get
right; it only makes sense to use matches with recursion (a fixed path will
either statically match or it won't, no need for a run-time check) but there
was nothing to warn users of this fact. To compound matters, the example
in the matches parameter doc string even made this mistake.
This patch: 1) fixes the doc string; 2) prohibits the use of match without a
value of recurse capable of generating files to match, 3) fixes tests that
were passing for the wrong reason and adds tests on the prohibition added
in (2).
|
| | |
| |
| |
| |
| |
| |
| | |
Puppet::Resource::Catalog's spec
This issue causes other specs to fail, because they depend on the
default terminus being unchanged.
|
| | |
| |
| |
| |
| |
| | |
The output variable in the inner block wasn't visible in the outer block,
and wasn't needed in any case, since the results are returned naturally
if you just leave everything alone.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a targeted fix to the issue of permissions when writing ssh authorized
key files by 1) requiring that an existing users be specified on the resource
and 2) doing the write as that user. It's based on Michael DeHaan's initial
implementation of Luke's idea, but with a number of simplifications (mostly by
testing necessary conditions as early as possible so the code isn't cluttered
up with a lot of checks).
|
| | |
| |
| |
| |
| |
| | |
It's about 10x faster to read the whole file than to read each line and
concatenate them (actually, it's O(n) vs. O(n^2), so the exact speedup
depends on the file size).
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The plussignment operator was constructing the new parameter value by
modifying the param object's value in place (so as to preserve the file
and line information for debugging). However, when multiple resources
are overridden by the same plussignment this would result in all of the
resources sharing the same value (the union of all the prior values and
the new value), which is wrong.
Instead, we need to give each resource its own copy of the value (e.g.,
a copy of the param object), which this patch implements.
Signed-off-by: Markus Roberts <Markus@reality.com>
|
| | |
| |
| |
| | |
Thanks to Benedikt Böhm for the patch
|
| | | |
|
| | |
| |
| |
| |
| | |
We default to logging via syslog so there aren't any puppet logs on many
boxes. Causing a weekly restart shouldn't be necessary.
|
| | | |
|
| | |
| |
| |
| | |
modules
|
