summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-12-21 16:36:03 -0600
committerLuke Kanies <luke@madstop.com>2007-12-21 16:36:03 -0600
commit4d28b10cd1ac8b549d488f18d272ad589c75445d (patch)
tree5a99e67086ecbdfa6f15e45644ef205aeef4d315
parente4446b64c12eb4f6aefad91c0997960303693d3a (diff)
downloadpuppet-4d28b10cd1ac8b549d488f18d272ad589c75445d.tar.gz
puppet-4d28b10cd1ac8b549d488f18d272ad589c75445d.tar.xz
puppet-4d28b10cd1ac8b549d488f18d272ad589c75445d.zip
Updating the failure when the CRL is missing, so it's
clear how to solve the problem.
-rw-r--r--lib/puppet/network/http_server/webrick.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb
index d2bb7b750..3c9f72e17 100644
--- a/lib/puppet/network/http_server/webrick.rb
+++ b/lib/puppet/network/http_server/webrick.rb
@@ -27,14 +27,14 @@ module Puppet
return nil
end
unless File.exist?(Puppet[:cacrl])
- raise Puppet::Error, "Could not find CRL"
+ raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'none' to disable CRL usage"
end
crl = OpenSSL::X509::CRL.new(File.read(Puppet[:cacrl]))
store = OpenSSL::X509::Store.new
store.purpose = OpenSSL::X509::PURPOSE_ANY
store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK
unless self.ca_cert
- raise Puppet::Error, "No CA certificate"
+ raise Puppet::Error, "Could not find CA certificate"
end
store.add_file(Puppet[:localcacert])