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

5 files changed, 6 insertions, 6 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: