# HG changeset patch # User Kenneth Chu <ksiuhengchu@gitlab.com> # Date 1619077634 -36000 # Thu Apr 22 17:47:14 2021 +1000 # Node ID be8cbd4fd4e0b4711eced1a1c85d9e4acdcd5316 # Parent 822d616db7aa5ee79be11f67de6ef3f73abd1d74 Refactor how the key size is determined diff --git a/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb b/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb --- a/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb +++ b/files/gitlab-cookbooks/letsencrypt/resources/certificate.rb @@ -24,7 +24,7 @@ if ::File.file?("#{new_resource.key}-staging") staging_key = OpenSSL::PKey::RSA.new ::File.read "#{new_resource.key}-staging" - staging_key_size = staging_key.to_text.split(/\n/).first[/[0-9]* bit/].split.first.to_i + staging_key_size = staging_key.n.num_bits if new_resource.key_size.nil? unless staging_key_size == node['acme']['key_size'] @@ -68,7 +68,7 @@ if ::File.file?(new_resource.key) production_key = OpenSSL::PKey::RSA.new ::File.read new_resource.key - production_key_size = production_key.to_text.split(/\n/).first[/[0-9]* bit/].split.first.to_i + production_key_size = production_key.n.num_bits if new_resource.key_size.nil? unless production_key_size == node['acme']['key_size']