diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-07 15:34:30 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-07 15:34:30 -0600 |
| commit | b293763f9ef2e134f18bb2c3fdaaaa502aa2c201 (patch) | |
| tree | eaa7e8eb8c4013be2e9c1560182558d393e5f5e7 /lib/puppet/sslcertificates/ca.rb | |
| parent | 2931723bae9e4226ab8eb7f6f806bf9a2ea5cbb8 (diff) | |
| download | puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.tar.gz puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.tar.xz puppet-b293763f9ef2e134f18bb2c3fdaaaa502aa2c201.zip | |
Applying patch by Jay to fix #989 -- missing crl files are
correctly ignored, and you now use 'false' instead of 'none'
to explicitly ignore them.
Diffstat (limited to 'lib/puppet/sslcertificates/ca.rb')
| -rw-r--r-- | lib/puppet/sslcertificates/ca.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index a3edd2cb4..888bcf5b2 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -194,8 +194,8 @@ class Puppet::SSLCertificates::CA # Revoke the certificate with serial number SERIAL issued by this # CA. The REASON must be one of the OpenSSL::OCSP::REVOKED_* reasons def revoke(serial, reason = OpenSSL::OCSP::REVOKED_STATUS_KEYCOMPROMISE) - if @config[:cacrl] == 'none' - raise Puppet::Error, "Revocation requires a CRL, but ca_crl is set to 'none'" + if @config[:cacrl] == 'false' + raise Puppet::Error, "Revocation requires a CRL, but ca_crl is set to 'false'" end time = Time.now revoked = OpenSSL::X509::Revoked.new @@ -372,7 +372,7 @@ class Puppet::SSLCertificates::CA @crl = OpenSSL::X509::CRL.new( File.read(@config[:cacrl]) ) - elsif @config[:cacrl] == 'none' + elsif @config[:cacrl] == 'false' @crl = nil else # Create new CRL |