summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-28 17:52:02 -0500
committerLuke Kanies <luke@madstop.com>2008-04-28 17:52:02 -0500
commit8c9b04d807b34ade704da3584b72d39bb129aa75 (patch)
treec76828f38c7c8d28f4b533d556e809d0bf3c1437 /lib/puppet/network
parent83519f4e59f68f867f8ddbe141ac8bd9a6238ae1 (diff)
downloadpuppet-8c9b04d807b34ade704da3584b72d39bb129aa75.tar.gz
puppet-8c9b04d807b34ade704da3584b72d39bb129aa75.tar.xz
puppet-8c9b04d807b34ade704da3584b72d39bb129aa75.zip
I think I've now got the Webrick SSL support working.
Now I just need to get xmlrpc working alongside REST in both mongrel and webrick.
Diffstat (limited to 'lib/puppet/network')
-rw-r--r--lib/puppet/network/http/webrick.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
index 8ccf974c6..2b3eace48 100644
--- a/lib/puppet/network/http/webrick.rb
+++ b/lib/puppet/network/http/webrick.rb
@@ -108,7 +108,7 @@ class Puppet::Network::HTTP::WEBrick
# LAK:NOTE I'm not sure why this is this way, actually.
results[:SSLCertName] = nil
- results[:SSLCertificateStore] = setup_ssl_store if Puppet[:cacrl] != 'false'
+ results[:SSLCertificateStore] = setup_ssl_store if Puppet[:hostcrl] != 'false'
results
end
@@ -116,7 +116,7 @@ class Puppet::Network::HTTP::WEBrick
# Create our Certificate revocation list
def setup_ssl_store
unless crl = Puppet::SSL::CertificateRevocationList.find("ca")
- raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'false' to disable CRL usage"
+ raise Puppet::Error, "Could not find CRL; set 'hostcrl' to 'false' to disable CRL usage"
end
store = OpenSSL::X509::Store.new
store.purpose = OpenSSL::X509::PURPOSE_ANY