Adding integration tests for a lot of the SSL code.

This flushed out some problems, and things mostly look good
now, but I don't think we're quite there yet.

4 files changed, 6 insertions, 5 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 7b206901c..ff302e8db 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -167,7 +167,7 @@ module Puppet
             certificate.  By default, only the server gets an alias set up, and only for 'puppet'."],
         :certdir => ["$ssldir/certs", "The certificate directory."],
         :publickeydir => ["$ssldir/public_keys", "The public key directory."],
-        :requestdir => ["$ssldir/public_keys", "The public key directory."],
+        :requestdir => ["$ssldir/certificate_requests", "Where host certificate requests are stored."],
         :privatekeydir => { :default => "$ssldir/private_keys",
             :mode => 0750,
             :desc => "The private key directory."
diff --git a/lib/puppet/indirector/ssl_file.rb b/lib/puppet/indirector/ssl_file.rb
index 7b3561263..44a66fab2 100644
--- a/lib/puppet/indirector/ssl_file.rb
+++ b/lib/puppet/indirector/ssl_file.rb
@@ -47,7 +47,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     end
 
     def initialize
-        Puppet.settings.use(:ssl)
+        Puppet.settings.use(:main, :ssl)
 
         (collection_directory || file_location) or raise Puppet::DevError, "No file or directory setting provided; terminus %s cannot function" % self.class.name
     end
diff --git a/lib/puppet/ssl/certificate_authority.rb b/lib/puppet/ssl/certificate_authority.rb
index 2ed45e08b..f9786fb1a 100644
--- a/lib/puppet/ssl/certificate_authority.rb
+++ b/lib/puppet/ssl/certificate_authority.rb
@@ -27,7 +27,7 @@ class Puppet::SSL::CertificateAuthority
         request.generate(host.key)
 
         # Create a self-signed certificate.
-        @certificate = sign(name, :ca, request)
+        @certificate = sign(host.name, :ca, request)
     end
 
     def initialize
@@ -40,7 +40,6 @@ class Puppet::SSL::CertificateAuthority
 
     # Sign a given certificate request.
     def sign(hostname, cert_type = :server, self_signing_csr = nil)
-
         # This is a self-signed certificate
         if self_signing_csr
             csr = self_signing_csr
diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb
index 42f881568..9b0ba2c71 100644
--- a/lib/puppet/ssl/host.rb
+++ b/lib/puppet/ssl/host.rb
@@ -17,6 +17,8 @@ class Puppet::SSL::Host
     attr_reader :name
     attr_accessor :ca
 
+    attr_writer :key, :certificate, :certificate_request
+
     CA_NAME = "ca"
 
     # This is the constant that people will use to mark that a given host is
@@ -150,7 +152,7 @@ class Puppet::SSL::Host
     def initialize(name)
         @name = name
         @key = @certificate = @certificate_request = nil
-        @ca = false
+        @ca = (name == self.class.ca_name)
     end
 
     # Extract the public key from the private key.