summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-05-27 10:55:28 -0500
committerJames Turnbull <james@lovedthanlost.net>2009-05-28 07:01:43 +1000
commitbc1445b5cefb5742ca906632cc99a82a769ead97 (patch)
treeb72d8687cc0573d054a7deaedaef3be2f3c70b7d /lib
parente0c19f99f44d94715984d5533daed25e35ac6f3b (diff)
downloadpuppet-bc1445b5cefb5742ca906632cc99a82a769ead97.tar.gz
puppet-bc1445b5cefb5742ca906632cc99a82a769ead97.tar.xz
puppet-bc1445b5cefb5742ca906632cc99a82a769ead97.zip
Fixing #2237 - client_yaml dir is always created by puppetd
This is just a simple call to Puppet.use in the puppetd setup method. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/puppetd.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 83bb65691..17b07d98e 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -211,6 +211,8 @@ Puppet::Application.new(:puppetd) do
Puppet::Util::Log.newdestination(logdest)
end
+ Puppet.settings.use :main, :puppetd, :ssl
+
# We need to specify a ca location for things to work, but
# until the REST cert transfers are working, it needs to
# be local.