diff options
| author | John A. Barbuto <jbarbuto@corp.sourceforge.com> | 2009-10-26 14:02:35 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-10-27 12:17:20 +1100 |
| commit | ff3a7bc17b66b73f5cf155a2ffb62ccd85f9e9bc (patch) | |
| tree | 25867986fbd53b50d4278750aa58a8c7221986d3 /lib/puppet/network/http_server | |
| parent | 594c774dd466c85eae829eaba3898d02ae9538ca (diff) | |
| download | puppet-ff3a7bc17b66b73f5cf155a2ffb62ccd85f9e9bc.tar.gz puppet-ff3a7bc17b66b73f5cf155a2ffb62ccd85f9e9bc.tar.xz puppet-ff3a7bc17b66b73f5cf155a2ffb62ccd85f9e9bc.zip | |
Re-fixed #2750 - Stop disabling the CRL or checking for a disabled CRL
This was deprecated in commit 1cfb0215 and was keeping puppetd from starting in listen mode.
Signed-off-by: John A. Barbuto <jbarbuto@corp.sourceforge.com>
Diffstat (limited to 'lib/puppet/network/http_server')
| -rw-r--r-- | lib/puppet/network/http_server/webrick.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb index a863d3a20..2dae9ccd8 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -21,13 +21,10 @@ module Puppet # with them, with flags appropriate for checking client # certificates for revocation def x509store - if Puppet[:cacrl] == 'false' + unless File.exist?(Puppet[:cacrl]) # No CRL, no store needed return nil end - unless File.exist?(Puppet[:cacrl]) - raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'false' 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 |