summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-04-18 11:53:59 -0500
committerLuke Kanies <luke@madstop.com>2008-04-18 11:53:59 -0500
commitd498c4ac4c7b97b5f8e004b3e31d8cbeed914711 (patch)
tree2906473e58932c0d1ab43ac2a4039d5a306fa6a2 /lib
parent67f9d6977a21a96bf0a2a4d1d9ebde190a58e7bc (diff)
downloadpuppet-d498c4ac4c7b97b5f8e004b3e31d8cbeed914711.tar.gz
puppet-d498c4ac4c7b97b5f8e004b3e31d8cbeed914711.tar.xz
puppet-d498c4ac4c7b97b5f8e004b3e31d8cbeed914711.zip
Adding support within the inventory for real certs or Puppet cert wrappers.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/ssl/inventory.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/ssl/inventory.rb b/lib/puppet/ssl/inventory.rb
index b701270b9..953c93d37 100644
--- a/lib/puppet/ssl/inventory.rb
+++ b/lib/puppet/ssl/inventory.rb
@@ -7,6 +7,8 @@ class Puppet::SSL::Inventory
# Add a certificate to our inventory.
def add(cert)
+ cert = cert.content if cert.is_a?(Puppet::SSL::Certificate)
+
# Create our file, if one does not already exist.
rebuild unless FileTest.exist?(@path)