File tree Expand file tree Collapse file tree 3 files changed +10
-3
lines changed Expand file tree Collapse file tree 3 files changed +10
-3
lines changed Original file line number Diff line number Diff line change 11Gitlab 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+
49v6.4.3
510------
611
Original file line number Diff line number Diff line change 9393default [ 'gitlab' ] [ 'trust_local_sshkeys' ] = 'yes'
9494
9595default [ 'gitlab' ] [ 'https' ] = false
96- default [ 'gitlab' ] [ 'certificate_databag_id' ]
96+ default [ 'gitlab' ] [ 'certificate_databag_id' ] = nil
9797default [ 'gitlab' ] [ 'self_signed_cert' ] = false
9898default [ 'gitlab' ] [ 'ssl_certificate' ] = "/etc/nginx/ssl/certs/#{ node [ 'fqdn' ] } .pem"
9999default [ 'gitlab' ] [ 'ssl_certificate_key' ] = "/etc/nginx/ssl/private/#{ node [ 'fqdn' ] } .key"
Original file line number Diff line number Diff line change 309309 not_if { File . exists? ( "#{ node [ 'gitlab' ] [ 'app_home' ] } /.gitlab-setup" ) }
310310end
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' ]
You can’t perform that action at this time.
0 commit comments