summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-08 16:35:06 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-08 16:35:06 +1100
commitc3ead0331adba5f60ea7d508775a89de68e26caa (patch)
treeaf3e519a74c3d93986bbad2428a343d7b9bf0b30 /lib/puppet/network
parentf7b0ca9e9475d4b6a9138d70256f143b8ba31f1a (diff)
parent084d0fb6351ed54ff4c052cff20f21e89063620c (diff)
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/network')
-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 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