Renaming the 'ca_file' ssl terminus type to 'ca'.

10 files changed, 28 insertions, 28 deletions

diff --git a/lib/puppet/indirector/certificate/ca_file.rb b/lib/puppet/indirector/certificate/ca.rb
index a7d901535..b64080e16 100644
--- a/lib/puppet/indirector/certificate/ca_file.rb
+++ b/lib/puppet/indirector/certificate/ca.rb
@@ -1,7 +1,7 @@
 require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate'
 
-class Puppet::SSL::Certificate::CaFile < Puppet::Indirector::SslFile
+class Puppet::SSL::Certificate::Ca < Puppet::Indirector::SslFile
     desc "Manage the CA collection of signed SSL certificates on disk."
 
     store_in :signeddir
diff --git a/lib/puppet/indirector/certificate_request/ca_file.rb b/lib/puppet/indirector/certificate_request/ca.rb
index 8c43f18d8..e90f43a03 100644
--- a/lib/puppet/indirector/certificate_request/ca_file.rb
+++ b/lib/puppet/indirector/certificate_request/ca.rb
@@ -1,7 +1,7 @@
 require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate_request'
 
-class Puppet::SSL::CertificateRequest::CaFile < Puppet::Indirector::SslFile
+class Puppet::SSL::CertificateRequest::Ca < Puppet::Indirector::SslFile
     desc "Manage the CA collection of certificate requests on disk."
 
     store_in :csrdir
diff --git a/lib/puppet/indirector/certificate_revocation_list/ca_file.rb b/lib/puppet/indirector/certificate_revocation_list/ca.rb
index d29a5ce3b..66cc23e50 100644
--- a/lib/puppet/indirector/certificate_revocation_list/ca_file.rb
+++ b/lib/puppet/indirector/certificate_revocation_list/ca.rb
@@ -1,7 +1,7 @@
 require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate_revocation_list'
 
-class Puppet::SSL::CertificateRevocationList::CaFile < Puppet::Indirector::SslFile
+class Puppet::SSL::CertificateRevocationList::Ca < Puppet::Indirector::SslFile
     desc "Manage the CA collection of certificate requests on disk."
 
     store_at :cacrl
diff --git a/lib/puppet/indirector/key/ca_file.rb b/lib/puppet/indirector/key/ca.rb
index 0193dea90..3604de22b 100644
--- a/lib/puppet/indirector/key/ca_file.rb
+++ b/lib/puppet/indirector/key/ca.rb
@@ -1,7 +1,7 @@
 require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/key'
 
-class Puppet::SSL::Key::CaFile < Puppet::Indirector::SslFile
+class Puppet::SSL::Key::Ca < Puppet::Indirector::SslFile
     desc "Manage the CA's private on disk.  This terminus *only* works
         with the CA key, because that's the only key that the CA ever interacts
         with."
@@ -13,7 +13,7 @@ class Puppet::SSL::Key::CaFile < Puppet::Indirector::SslFile
 
     def path(name)
         unless ca?(name)
-            raise ArgumentError, "The :ca_file terminus can only handle the CA private key"
+            raise ArgumentError, "The :ca terminus can only handle the CA private key"
         end
         super
     end
diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb
index 931d64ab3..25e31943a 100644
--- a/lib/puppet/ssl/host.rb
+++ b/lib/puppet/ssl/host.rb
@@ -65,7 +65,7 @@ class Puppet::SSL::Host
         when :local:
             # Our ca is local, so we use it as the ultimate source of information
             # And we cache files locally.
-            configure_indirection :ca_file, :file
+            configure_indirection :ca, :file
         when :remote:
             configure_indirection :rest, :file
         when :none:
diff --git a/spec/unit/indirector/certificate/ca_file.rb b/spec/unit/indirector/certificate/ca.rb
index 864bc87bd..0158a8d90 100755
--- a/spec/unit/indirector/certificate/ca_file.rb
+++ b/spec/unit/indirector/certificate/ca.rb
@@ -5,23 +5,23 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/certificate/ca_file'
+require 'puppet/indirector/certificate/ca'
 
-describe Puppet::SSL::Certificate::CaFile do
+describe Puppet::SSL::Certificate::Ca do
     it "should have documentation" do
-        Puppet::SSL::Certificate::CaFile.doc.should be_instance_of(String)
+        Puppet::SSL::Certificate::Ca.doc.should be_instance_of(String)
     end
 
     it "should use the :signeddir as the collection directory" do
         Puppet.settings.expects(:value).with(:signeddir).returns "/cert/dir"
-        Puppet::SSL::Certificate::CaFile.collection_directory.should == "/cert/dir"
+        Puppet::SSL::Certificate::Ca.collection_directory.should == "/cert/dir"
     end
 
     it "should store the ca certificate at the :cacert location" do
         Puppet.settings.stubs(:use)
         Puppet.settings.stubs(:value).returns "whatever"
         Puppet.settings.stubs(:value).with(:cacert).returns "/ca/cert"
-        file = Puppet::SSL::Certificate::CaFile.new
+        file = Puppet::SSL::Certificate::Ca.new
         file.stubs(:ca?).returns true
         file.path("whatever").should == "/ca/cert"
     end
diff --git a/spec/unit/indirector/certificate_request/ca_file.rb b/spec/unit/indirector/certificate_request/ca.rb
index 7b264fefb..b35d8b474 100755
--- a/spec/unit/indirector/certificate_request/ca_file.rb
+++ b/spec/unit/indirector/certificate_request/ca.rb
@@ -5,15 +5,15 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/certificate_request/ca_file'
+require 'puppet/indirector/certificate_request/ca'
 
-describe Puppet::SSL::CertificateRequest::CaFile do
+describe Puppet::SSL::CertificateRequest::Ca do
     it "should have documentation" do
-        Puppet::SSL::CertificateRequest::CaFile.doc.should be_instance_of(String)
+        Puppet::SSL::CertificateRequest::Ca.doc.should be_instance_of(String)
     end
 
     it "should use the :csrdir as the collection directory" do
         Puppet.settings.expects(:value).with(:csrdir).returns "/request/dir"
-        Puppet::SSL::CertificateRequest::CaFile.collection_directory.should == "/request/dir"
+        Puppet::SSL::CertificateRequest::Ca.collection_directory.should == "/request/dir"
     end
 end
diff --git a/spec/unit/indirector/certificate_revocation_list/ca_file.rb b/spec/unit/indirector/certificate_revocation_list/ca.rb
index fa5379dfa..f6da86861 100755
--- a/spec/unit/indirector/certificate_revocation_list/ca_file.rb
+++ b/spec/unit/indirector/certificate_revocation_list/ca.rb
@@ -5,17 +5,17 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/certificate_revocation_list/ca_file'
+require 'puppet/indirector/certificate_revocation_list/ca'
 
-describe Puppet::SSL::CertificateRevocationList::CaFile do
+describe Puppet::SSL::CertificateRevocationList::Ca do
     it "should have documentation" do
-        Puppet::SSL::CertificateRevocationList::CaFile.doc.should be_instance_of(String)
+        Puppet::SSL::CertificateRevocationList::Ca.doc.should be_instance_of(String)
     end
 
     it "should use the :cacrl setting as the crl location" do
         Puppet.settings.stubs(:value).returns "whatever"
         Puppet.settings.stubs(:use)
         Puppet.settings.stubs(:value).with(:cacrl).returns "/request/dir"
-        Puppet::SSL::CertificateRevocationList::CaFile.new.path("whatever").should == "/request/dir"
+        Puppet::SSL::CertificateRevocationList::Ca.new.path("whatever").should == "/request/dir"
     end
 end
diff --git a/spec/unit/indirector/key/ca_file.rb b/spec/unit/indirector/key/ca.rb
index 256c3b44a..579617f71 100755
--- a/spec/unit/indirector/key/ca_file.rb
+++ b/spec/unit/indirector/key/ca.rb
@@ -5,18 +5,18 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/key/ca_file'
+require 'puppet/indirector/key/ca'
 
-describe Puppet::SSL::Key::CaFile do
+describe Puppet::SSL::Key::Ca do
     it "should have documentation" do
-        Puppet::SSL::Key::CaFile.doc.should be_instance_of(String)
+        Puppet::SSL::Key::Ca.doc.should be_instance_of(String)
     end
 
     it "should store the ca key at the :cakey location" do
         Puppet.settings.stubs(:use)
         Puppet.settings.stubs(:value).returns "whatever"
         Puppet.settings.stubs(:value).with(:cakey).returns "/ca/key"
-        file = Puppet::SSL::Key::CaFile.new
+        file = Puppet::SSL::Key::Ca.new
         file.stubs(:ca?).returns true
         file.path("whatever").should == "/ca/key"
     end
@@ -26,7 +26,7 @@ describe Puppet::SSL::Key::CaFile do
             Puppet.settings.stubs(:use)
             Puppet.settings.stubs(:value).returns "whatever"
             Puppet.settings.stubs(:value).with(:cakey).returns "/ca/key"
-            file = Puppet::SSL::Key::CaFile.new
+            file = Puppet::SSL::Key::Ca.new
             file.stubs(:ca?).returns false
             lambda { file.path("whatever") }.should raise_error(ArgumentError)
         end
diff --git a/spec/unit/ssl/host.rb b/spec/unit/ssl/host.rb
index b214aa44a..4e0f5c5df 100755
--- a/spec/unit/ssl/host.rb
+++ b/spec/unit/ssl/host.rb
@@ -80,10 +80,10 @@ describe Puppet::SSL::Host do
                 Puppet::SSL::Host.ca_location = :local
             end
 
-            it "should set the terminus class for Certificate, CertificateRevocationList, and CertificateRequest as :ca_file" do
-                Puppet::SSL::Certificate.expects(:terminus_class=).with :ca_file
-                Puppet::SSL::CertificateRequest.expects(:terminus_class=).with :ca_file
-                Puppet::SSL::CertificateRevocationList.expects(:terminus_class=).with :ca_file
+            it "should set the terminus class for Certificate, CertificateRevocationList, and CertificateRequest as :ca" do
+                Puppet::SSL::Certificate.expects(:terminus_class=).with :ca
+                Puppet::SSL::CertificateRequest.expects(:terminus_class=).with :ca
+                Puppet::SSL::CertificateRevocationList.expects(:terminus_class=).with :ca
 
                 Puppet::SSL::Host.ca_location = :local
             end