summaryrefslogtreecommitdiffstats
path: root/bin/puppetd
diff options
context:
space:
mode:
Diffstat (limited to 'bin/puppetd')
-rwxr-xr-xbin/puppetd5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/puppetd b/bin/puppetd
index 2a71c3a8d..c36b3ed97 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -322,6 +322,11 @@ if options[:centrallogs]
Puppet::Util::Log.newdestination(logdest)
end
+# We need to specify a ca location for things to work, but
+# until the REST cert transfers are working, it needs to
+# be local.
+Puppet::SSL::Host.ca_location = :local
+
# We need tomake the client either way, we just don't start it
# if --no-client is set.
client = Puppet::Network::Client.master.new(args)