Moving the password file handling into the SSL::Key class.

This was necessary because when the Indirector is used, there
isn't necessarily enough context available to know when a
password file should be used (e.g., when reading a Key from disk,
you don't know if that key was encrypted).

Now, the Key class automatically uses the right password file, and
only tries to use those files that actually exist.

This isn't very flexible, in that it only allows one CA file and
one non-CA file, but no one really uses anything but
the CA file anyway.

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/puppet/ssl/base.rb b/lib/puppet/ssl/base.rb
index ab040152d..80bfcae84 100644
--- a/lib/puppet/ssl/base.rb
+++ b/lib/puppet/ssl/base.rb
@@ -13,6 +13,11 @@ class Puppet::SSL::Base
 
     attr_accessor :name, :content
 
+    # Is this file for the CA?
+    def ca?
+        name == Puppet::SSL::Host.ca_name
+    end
+
     def generate
         raise Puppet::DevError, "%s did not override 'generate'" % self.class
     end