diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-08 16:35:06 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-08 16:35:06 +1100 |
| commit | c3ead0331adba5f60ea7d508775a89de68e26caa (patch) | |
| tree | af3e519a74c3d93986bbad2428a343d7b9bf0b30 /lib/puppet/sslcertificates | |
| parent | f7b0ca9e9475d4b6a9138d70256f143b8ba31f1a (diff) | |
| parent | 084d0fb6351ed54ff4c052cff20f21e89063620c (diff) | |
| download | puppet-c3ead0331adba5f60ea7d508775a89de68e26caa.tar.gz puppet-c3ead0331adba5f60ea7d508775a89de68e26caa.tar.xz puppet-c3ead0331adba5f60ea7d508775a89de68e26caa.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/sslcertificates')
| -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 |