summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-05-05 22:36:59 -0500
committerLuke Kanies <luke@madstop.com>2008-05-05 22:36:59 -0500
commit38e2dcf35a1d9b19970d1fb253f6c09b0529e083 (patch)
treed4e28bf2ebc43b73bfd36bfb72bf5b5da53e6ee7 /lib
parent6e0d6ddf5ef1cd6b23a672020bb657744b5a2c59 (diff)
downloadpuppet-38e2dcf35a1d9b19970d1fb253f6c09b0529e083.tar.gz
puppet-38e2dcf35a1d9b19970d1fb253f6c09b0529e083.tar.xz
puppet-38e2dcf35a1d9b19970d1fb253f6c09b0529e083.zip
The master is now functionally serving REST and xmlrpc.
...as far as I can tell. The client, however, is broken, since it used the old http_pool/ssl_support stuff, which no longer works. I have to port puppetd over to using the new ssl stuff, then I'll at least be able to verify that the master can still speak xmlrpc.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/network/http/webrick.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
index 30085ec47..3e7a28598 100644
--- a/lib/puppet/network/http/webrick.rb
+++ b/lib/puppet/network/http/webrick.rb
@@ -91,7 +91,7 @@ class Puppet::Network::HTTP::WEBrick
host = Puppet::SSL::Host.new
- host.generate unless host.key
+ host.generate unless host.certificate
raise Puppet::Error, "Could not retrieve certificate for %s and not running on a valid certificate authority" % host.name unless host.certificate