From 330359015602eba83077fccaa708c819d2d78b53 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 7 May 2008 12:29:58 -0500 Subject: The master and client now successfully speak xmlrpc using the new system. The server is actually serving REST, but the client can't use it until we resolve the format and security issues that REST hasn't yet tackled. --- bin/puppetmasterd | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bin/puppetmasterd') diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 57fc4bdb4..625b75d52 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -160,6 +160,15 @@ Puppet::Node::Facts.terminus_class = :yaml # Cache our nodes in yaml. Currently not configurable. Puppet::Node.cache_class = :yaml +# Configure all of the SSL stuff. +if Puppet::SSL::CertificateAuthority.ca? + Puppet::SSL::Host.ca_location = :local + Puppet.settings.use :main, :ssl, :ca + Puppet::SSL::CertificateAuthority.instance +else + Puppet::SSL::Host.ca_location = :none +end + require 'etc' if Puppet[:parseonly] -- cgit