summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJohn A. Barbuto <jbarbuto@corp.sourceforge.com>2009-10-22 18:16:16 -0700
committerJames Turnbull <james@lovedthanlost.net>2009-10-25 11:13:56 +1100
commitb6e4ef37f7ac4844697f1857cbcf03a2796db7d4 (patch)
treed4bcbc54a48a76fdad679482c58a2eb43db1137a /lib/puppet
parent2b57e065d2220be4f172ae429190bd116ddbdaf1 (diff)
downloadpuppet-b6e4ef37f7ac4844697f1857cbcf03a2796db7d4.tar.gz
puppet-b6e4ef37f7ac4844697f1857cbcf03a2796db7d4.tar.xz
puppet-b6e4ef37f7ac4844697f1857cbcf03a2796db7d4.zip
Fixed #2750 - Set :cacrl to nil instead of 'false' in puppetd
The latter is deprecated and was keeping puppetd from starting. Also added a test and fixed a typo in another test. Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/puppetd.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 4799d5571..26c9f825e 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -164,7 +164,7 @@ Puppet::Application.new(:puppetd) do
# to clients. In the meantime, we just disable CRL checking if
# the CRL file doesn't exist
unless File::exist?(Puppet[:cacrl])
- Puppet[:cacrl] = 'false'
+ Puppet[:cacrl] = nil
end
handlers = nil