Skip to content
Snippets Groups Projects
Commit 87715b05c1b9 authored by Robert Marshall's avatar Robert Marshall
Browse files

Update chef-acme to 4.1.5

- Updates chef-acme to 4.1.5

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6405

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6611

Changelog: changed
parent 1d2cb95ded3e
No related branches found
No related tags found
2 merge requests!76heptapod#711: 0.34 is the new stable,!73Sync up to upstream Omnibus GitLab 15.1
......@@ -15,7 +15,7 @@
#
name 'chef-acme'
version = Gitlab::Version.new(name, 'v4.1.3')
version = Gitlab::Version.new(name, 'v4.1.5')
default_version version.print(false)
license 'Apache-2.0'
......
......@@ -14,6 +14,7 @@
# We assume that the certificate and key will be stored in the same directory
ssl_dir = File.dirname(node['gitlab']['nginx']['ssl_certificate'])
node.default['acme']['private_key_file'] = File.join(ssl_dir, 'letsencrypt_account_private_key.pem')
directory ssl_dir do
owner 'root'
......
......@@ -59,6 +59,11 @@
end
end
# Delete the private key_file
file node['acme']['private_key_file'] do
action :delete
end
if ::File.file?(new_resource.key)
production_key = OpenSSL::PKey::RSA.new ::File.read new_resource.key
production_key_size = production_key.n.num_bits
......@@ -88,4 +93,9 @@
notifies :run, 'execute[reload nginx]'
sensitive true
end
# Delete the private key_file
file node['acme']['private_key_file'] do
action :delete
end
end
......@@ -44,6 +44,10 @@
)
end
it "deletes the private_key_file" do
expect(chef_run).to delete_file('/etc/gitlab/ssl/letsencrypt_account_private_key.pem')
end
context 'specifying a different key_size' do
before do
allow(File).to receive(:file?).and_call_original
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment