summaryrefslogtreecommitdiffstats
path: root/lib/puppet/ssl
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-04-24 03:32:48 +1000
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit5988f76aac63c4cb33c3e138c830eaf8aa4abfff (patch)
tree6a3d6a1a84379cf0109b9f124dd51fe7fd156db7 /lib/puppet/ssl
parent2c153b12921d67354ea0968ad81590a124ac8b75 (diff)
downloadpuppet-5988f76aac63c4cb33c3e138c830eaf8aa4abfff.tar.gz
puppet-5988f76aac63c4cb33c3e138c830eaf8aa4abfff.tar.xz
puppet-5988f76aac63c4cb33c3e138c830eaf8aa4abfff.zip
Fixes #3663 - It should be possible to list signed hosts only
Adds a --signed option to the --list feature that only displays signed certificates
Diffstat (limited to 'lib/puppet/ssl')
-rw-r--r--lib/puppet/ssl/certificate_authority/interface.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/ssl/certificate_authority/interface.rb b/lib/puppet/ssl/certificate_authority/interface.rb
index d2dc7b9b5..b60834a2c 100644
--- a/lib/puppet/ssl/certificate_authority/interface.rb
+++ b/lib/puppet/ssl/certificate_authority/interface.rb
@@ -56,6 +56,8 @@ class Puppet::SSL::CertificateAuthority::Interface
if subjects == :all
hosts = [signed, requests].flatten
+ elsif subjects == :signed
+ hosts = signed.flatten
else
hosts = subjects
end
@@ -116,7 +118,7 @@ class Puppet::SSL::CertificateAuthority::Interface
# Set the list of hosts we're operating on. Also supports keywords.
def subjects=(value)
- unless value == :all or value.is_a?(Array)
+ unless value == :all or value == :signed or value.is_a?(Array)
raise ArgumentError, "Subjects must be an array or :all; not %s" % value
end