Skip to content

Commit 49912fa

Browse files
v6.4.4
* Issue atomic-penguin#62, certificate resource does not exist if nil, and used as name attribute.
1 parent f253249 commit 49912fa

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Gitlab Cookbook Changelog
22
=========================
33

4+
v6.4.4
5+
------
6+
7+
* Issue #62, certificate resource does not exist if nil, and used as name attribute.
8+
49
v6.4.3
510
------
611

attributes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
default['gitlab']['trust_local_sshkeys'] = 'yes'
9494

9595
default['gitlab']['https'] = false
96-
default['gitlab']['certificate_databag_id']
96+
default['gitlab']['certificate_databag_id'] = nil
9797
default['gitlab']['self_signed_cert'] = false
9898
default['gitlab']['ssl_certificate'] = "/etc/nginx/ssl/certs/#{node['fqdn']}.pem"
9999
default['gitlab']['ssl_certificate_key'] = "/etc/nginx/ssl/private/#{node['fqdn']}.key"

recipes/default.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,10 @@
309309
not_if { File.exists?("#{node['gitlab']['app_home']}/.gitlab-setup") }
310310
end
311311

312-
# Use certificate cookbook for keys
313-
certificate_manage node['gitlab']['certificate_databag_id'] do
312+
# Use certificate cookbook for keys.
313+
# Look for `search_id` in data_bag `certificates`
314+
certificate_manage 'gitlab' do
315+
search_id node['gitlab']['certificate_databag_id']
314316
cert_path '/etc/nginx/ssl'
315317
owner node['gitlab']['user']
316318
group node['gitlab']['user']

0 commit comments

Comments
 (0)