diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-07 15:34:30 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-07 15:34:30 -0600 |
| commit | b293763f9ef2e134f18bb2c3fdaaaa502aa2c201 (patch) | |
| tree | eaa7e8eb8c4013be2e9c1560182558d393e5f5e7 /lib/puppet/network/http_server | |
| parent | 2931723bae9e4226ab8eb7f6f806bf9a2ea5cbb8 (diff) | |
| download | puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.tar.gz puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.tar.xz puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.zip | |
Applying patch by Jay to fix #989 -- missing crl files are
correctly ignored, and you now use 'false' instead of 'none'
to explicitly ignore them.
Diffstat (limited to 'lib/puppet/network/http_server')
| -rw-r--r-- | lib/puppet/network/http_server/webrick.rb | 4 |
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 3c9f72e17..e4f00dd73 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -22,12 +22,12 @@ module Puppet # with them, with flags appropriate for checking client # certificates for revocation def x509store - if Puppet[:cacrl] == 'none' + if Puppet[:cacrl] == 'false' # No CRL, no store needed return nil end unless File.exist?(Puppet[:cacrl]) - raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'none' to disable CRL usage" + 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 |