summaryrefslogtreecommitdiffstats
path: root/bin/puppetmasterd
diff options
context:
space:
mode:
Diffstat (limited to 'bin/puppetmasterd')
-rwxr-xr-xbin/puppetmasterd9
1 files changed, 9 insertions, 0 deletions
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]