Skip to content

Commit 7422d76

Browse files
committed
compatibility with certificate cookbook
1 parent 2b1edbc commit 7422d76

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

resources/persistence.rb

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@
2323
end
2424

2525
data = {
26-
'id' => cn,
27-
'alt_names' => alt_names,
26+
'id' => cn,
27+
'alt_names' => alt_names,
28+
'created_by' => node['fqdn'],
29+
'created_at' => Time.now
2830
}
2931

32+
# 'key', 'cert', 'chain' are also used in the data bag format used by
33+
# https://github.com/atomic-penguin/cookbook-certificate/blob/master/providers/manage.rb
3034
data['key'] = ::File.read(new_resource.key) if new_resource.key
31-
data['crt'] = ::File.read(new_resource.crt) if new_resource.crt
35+
data['cert'] = ::File.read(new_resource.crt) if new_resource.crt
3236
data['chain'] = ::File.read(new_resource.chain) if new_resource.chain
33-
data['fullchain'] = ::File.read(new_resource.fullchain) if new_resource.fullchain
3437

35-
data['created_by'] = node['fqdn']
36-
data['created_at'] = Time.now
38+
data['fullchain'] = ::File.read(new_resource.fullchain) if new_resource.fullchain
3739

3840
chef_data_bag_item "#{data_bag_name}/#{cn}" do
3941
raw_data data
@@ -89,7 +91,7 @@ def self_signed?(cert)
8991
end
9092

9193
def item_newer?(item, existing_cert)
92-
item_cert = ::OpenSSL::X509::Certificate.new item['crt'] if item['crt']
94+
item_cert = ::OpenSSL::X509::Certificate.new item['cert'] if item['cert']
9395
item_cert ||= ::OpenSSL::X509::Certificate.new item['fullchain'] if item['fullchain']
9496
item_cert.not_before > existing_cert.not_before
9597
rescue OpenSSL::X509::CertificateError => e
@@ -112,10 +114,10 @@ def render_to_files(item)
112114
owner new_resource.owner
113115
group new_resource.group
114116
mode 00644
115-
content item['crt']
117+
content item['cert']
116118
action :create
117119

118-
only_if { !!item['crt'] }
120+
only_if { !!item['cert'] }
119121
end
120122

121123
file "acme_store: #{new_resource.cn} SSL fullchain" do

0 commit comments

Comments
 (0)