summaryrefslogtreecommitdiffstats
path: root/spec/unit/network/http
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 /spec/unit/network/http
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 'spec/unit/network/http')
-rw-r--r--spec/unit/network/http/webrick.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/unit/network/http/webrick.rb b/spec/unit/network/http/webrick.rb
index 1955c3e00..48b995c28 100644
--- a/spec/unit/network/http/webrick.rb
+++ b/spec/unit/network/http/webrick.rb
@@ -337,7 +337,7 @@ describe Puppet::Network::HTTP::WEBrick do
it "should specify the path to the CA certificate" do
Puppet.settings.stubs(:value).returns "whatever"
- Puppet.settings.stubs(:value).with(:cacrl).returns 'false'
+ Puppet.settings.stubs(:value).with(:hostcrl).returns 'false'
Puppet.settings.stubs(:value).with(:localcacert).returns '/ca/crt'
@server.setup_ssl[:SSLCACertificateFile].should == "/ca/crt"
@@ -357,7 +357,7 @@ describe Puppet::Network::HTTP::WEBrick do
it "should add an x509 store if the CRL is enabled" do
Puppet.settings.stubs(:value).returns "whatever"
- Puppet.settings.stubs(:value).with(:cacrl).returns '/my/crl'
+ Puppet.settings.stubs(:value).with(:hostcrl).returns '/my/crl'
@server.expects(:setup_ssl_store).returns("mystore")
@@ -366,7 +366,7 @@ describe Puppet::Network::HTTP::WEBrick do
it "should not add an x509 store if the CRL is disabled" do
Puppet.settings.stubs(:value).returns "whatever"
- Puppet.settings.stubs(:value).with(:cacrl).returns 'false'
+ Puppet.settings.stubs(:value).with(:hostcrl).returns 'false'
@server.expects(:setup_ssl_store).never