diff options
author | Luke Kanies <luke@madstop.com> | 2008-04-21 22:30:01 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-04-21 22:30:01 -0500 |
commit | 58fb416e9f52a9dc834b735ffa7e5c425495c982 (patch) | |
tree | 7cd0338ef9934a3ac567f6a1eda952da5d746960 | |
parent | 79ca44404af29b2bae621f9a6cb80467d95468aa (diff) | |
download | puppet-58fb416e9f52a9dc834b735ffa7e5c425495c982.tar.gz puppet-58fb416e9f52a9dc834b735ffa7e5c425495c982.tar.xz puppet-58fb416e9f52a9dc834b735ffa7e5c425495c982.zip |
Changing the File certificate terminus so that it
saves to the :localcacert instead of :cacert.
This way the :ca terminus saves to :cacert and the :file
terminus saves to :localcacert.
-rw-r--r-- | lib/puppet/indirector/certificate/file.rb | 2 | ||||
-rwxr-xr-x | spec/unit/indirector/certificate/file.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/indirector/certificate/file.rb b/lib/puppet/indirector/certificate/file.rb index 5f4ade051..c19d001f4 100644 --- a/lib/puppet/indirector/certificate/file.rb +++ b/lib/puppet/indirector/certificate/file.rb @@ -5,5 +5,5 @@ class Puppet::SSL::Certificate::File < Puppet::Indirector::SslFile desc "Manage SSL certificates on disk." store_in :certdir - store_ca_at :cacert + store_ca_at :localcacert end diff --git a/spec/unit/indirector/certificate/file.rb b/spec/unit/indirector/certificate/file.rb index ffaf12047..6fb00f1ca 100755 --- a/spec/unit/indirector/certificate/file.rb +++ b/spec/unit/indirector/certificate/file.rb @@ -17,10 +17,10 @@ describe Puppet::SSL::Certificate::File do Puppet::SSL::Certificate::File.collection_directory.should == "/cert/dir" end - it "should store the ca certificate at the :cacert location" do + it "should store the ca certificate at the :localcacert location" do Puppet.settings.stubs(:use) Puppet.settings.stubs(:value).returns "whatever" - Puppet.settings.stubs(:value).with(:cacert).returns "/ca/cert" + Puppet.settings.stubs(:value).with(:localcacert).returns "/ca/cert" file = Puppet::SSL::Certificate::File.new file.stubs(:ca?).returns true file.path("whatever").should == "/ca/cert" |