summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-06-30 16:07:02 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-06-30 17:44:07 -0700
commite848d4104350543241fa1a84aa3eaaf3a27d2616 (patch)
treeba03bed5ec51a7c8d91ae818acdcfdd2f27c61f3
parent255628e101e9da3ef4024c6e3b446e354b95b21d (diff)
downloadpuppet-e848d4104350543241fa1a84aa3eaaf3a27d2616.tar.gz
puppet-e848d4104350543241fa1a84aa3eaaf3a27d2616.tar.xz
puppet-e848d4104350543241fa1a84aa3eaaf3a27d2616.zip
[#3961] puppet cert --generate implies ca_location = :local
-rw-r--r--lib/puppet/application/cert.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/application/cert.rb b/lib/puppet/application/cert.rb
index 68d1f78fa..acbafb2d0 100644
--- a/lib/puppet/application/cert.rb
+++ b/lib/puppet/application/cert.rb
@@ -70,7 +70,11 @@ class Puppet::Application::Cert < Puppet::Application
Puppet::Util::Log.newdestination :console
- Puppet::SSL::Host.ca_location = :only
+ if @cert_mode == :generate
+ Puppet::SSL::Host.ca_location = :local
+ else
+ Puppet::SSL::Host.ca_location = :only
+ end
begin
@ca = Puppet::SSL::CertificateAuthority.new