summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/puppetd.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/application/puppetd.rb')
-rw-r--r--lib/puppet/application/puppetd.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index c1f733183..9302cf105 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -137,7 +137,7 @@ Puppet::Application.new(:puppetd) do
options[:verbose] = true
options[:onetime] = true
options[:detailed_exitcodes] = true
- options[:waitforcert] = 0
+ options[:waitforcert] = 0 unless @explicit_waitforcert
end
# Handle the logging settings.
@@ -172,13 +172,6 @@ Puppet::Application.new(:puppetd) do
exit(14)
end
- # FIXME: we should really figure out how to distribute the CRL
- # 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'
- end
-
handlers = nil
if options[:serve].empty?