summaryrefslogtreecommitdiffstats
path: root/lib/puppet/ssl
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-03-11 15:02:15 -0700
committerLuke Kanies <luke@madstop.com>2008-04-15 21:34:04 -0500
commit00e35bce4e8b7f4e0e4ee039a1d82ad9d08a6b96 (patch)
tree823d3210e4c66643d14752f93334744a12e13ae1 /lib/puppet/ssl
parent8347b0605612128b1a9e9f2d2d2e5ea73dae288d (diff)
Adding he last of the indirection classes for the ssl
classes, finally including the certificate requests.
Diffstat (limited to 'lib/puppet/ssl')
-rw-r--r--lib/puppet/ssl/certificate.rb5
-rw-r--r--lib/puppet/ssl/certificate_request.rb2
-rw-r--r--lib/puppet/ssl/key.rb2
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/puppet/ssl/certificate.rb b/lib/puppet/ssl/certificate.rb
index 9a89b4530..d1687e6f0 100644
--- a/lib/puppet/ssl/certificate.rb
+++ b/lib/puppet/ssl/certificate.rb
@@ -1,13 +1,12 @@
require 'puppet/ssl/base'
-# The class that manages all aspects of our SSL certificates --
-# private keys, public keys, requests, etc.
+# Manage certificates themselves.
class Puppet::SSL::Certificate < Puppet::SSL::Base
# This is defined from the base class
wraps OpenSSL::X509::Certificate
extend Puppet::Indirector
- indirects :certificate #, :terminus_class => :file
+ indirects :certificate, :terminus_class => :file
def generate
raise Puppet::DevError, "Cannot generate certificates directly; they must be generated during signing"
diff --git a/lib/puppet/ssl/certificate_request.rb b/lib/puppet/ssl/certificate_request.rb
index 67f0f23c6..fec9e1733 100644
--- a/lib/puppet/ssl/certificate_request.rb
+++ b/lib/puppet/ssl/certificate_request.rb
@@ -1,6 +1,6 @@
require 'puppet/ssl/base'
-# This constant just exists for us to use for adding our request terminii.
+# Manage certificate requests.
class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
wraps OpenSSL::X509::Request
diff --git a/lib/puppet/ssl/key.rb b/lib/puppet/ssl/key.rb
index 18bf2a4cb..a9c8717f8 100644
--- a/lib/puppet/ssl/key.rb
+++ b/lib/puppet/ssl/key.rb
@@ -6,7 +6,7 @@ class Puppet::SSL::Key < Puppet::SSL::Base
wraps OpenSSL::PKey::RSA
extend Puppet::Indirector
- indirects :key #, :terminus_class => :file
+ indirects :key, :terminus_class => :file
# Knows how to create keys with our system defaults.
def generate