diff options
| author | Luke Kanies <luke@madstop.com> | 2009-05-17 23:38:39 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-05-17 23:38:39 -0500 |
| commit | 7ce42daf5a0c2e3946732f7acb1c0ce680dc432e (patch) | |
| tree | 9e11d105375faa3144c939b87625f3d2c91e4eb7 | |
| parent | e1779c7711458f718babca5db27427eeb14ae724 (diff) | |
| download | puppet-7ce42daf5a0c2e3946732f7acb1c0ce680dc432e.tar.gz puppet-7ce42daf5a0c2e3946732f7acb1c0ce680dc432e.tar.xz puppet-7ce42daf5a0c2e3946732f7acb1c0ce680dc432e.zip | |
Fixing #2273 - CA location is set correctly in puppetca
It's set to 'only' instead of 'local'.
Signed-off-by: Luke Kanies <luke@madstop.com>
| -rw-r--r-- | lib/puppet/application/puppetca.rb | 2 | ||||
| -rw-r--r-- | spec/unit/application/puppetca.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetca.rb b/lib/puppet/application/puppetca.rb index 09de6c302..68ea3e5fb 100644 --- a/lib/puppet/application/puppetca.rb +++ b/lib/puppet/application/puppetca.rb @@ -58,7 +58,7 @@ Puppet::Application.new(:puppetca) do Puppet::Util::Log.newdestination :console - Puppet::SSL::Host.ca_location = :local + Puppet::SSL::Host.ca_location = :only begin @ca = Puppet::SSL::CertificateAuthority.new diff --git a/spec/unit/application/puppetca.rb b/spec/unit/application/puppetca.rb index 38ceacbcc..d5ee0d06b 100644 --- a/spec/unit/application/puppetca.rb +++ b/spec/unit/application/puppetca.rb @@ -86,6 +86,12 @@ describe "PuppetCA" do lambda { @puppetca.run_setup }.should raise_error(SystemExit) end + it "should set the CA location to 'only'" do + Puppet::SSL::Host.expects(:ca_location=).with(:only) + + @puppetca.run_setup + end + it "should create a new certificate authority" do Puppet::SSL::CertificateAuthority.expects(:new) |