From 10b1313e7715a77f0a899006870ccead4fe614f3 Mon Sep 17 00:00:00 2001
From: whitestar <whitestar@users.osdn.me>
Date: Tue, 5 Sep 2017 22:03:01 +0900
Subject: [PATCH] improves server key pair deployment for a Docker registry
 service.

---
 cookbooks/docker-grid/CHANGELOG.md               | 4 ++++
 cookbooks/docker-grid/metadata.rb                | 2 +-
 cookbooks/docker-grid/recipes/registry-server.rb | 3 ++-
 cookbooks/docker-grid/recipes/registry.rb        | 3 ++-
 cookbooks/docker-grid/version                    | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index 3e00194..4e13b1a 100644
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # docker-grid CHANGELOG
 
+0.5.3
+-----
+- improves server key pair deployment for a Docker registry service.
+
 0.5.2
 -----
 - adds the `docker_volumes_cleanup` script.
diff --git a/cookbooks/docker-grid/metadata.rb b/cookbooks/docker-grid/metadata.rb
index 52356f7..2e56418 100644
--- a/cookbooks/docker-grid/metadata.rb
+++ b/cookbooks/docker-grid/metadata.rb
@@ -18,4 +18,4 @@ supports 'debian', '>= 9.0'
 supports 'ubuntu', '>= 14.04'
 
 depends 'platform_utils', '>= 0.4.4'
-depends 'ssl_cert', '>= 0.3.2'
+depends 'ssl_cert', '>= 0.4.1'
diff --git a/cookbooks/docker-grid/recipes/registry-server.rb b/cookbooks/docker-grid/recipes/registry-server.rb
index 38cd3f1..10b1d64 100644
--- a/cookbooks/docker-grid/recipes/registry-server.rb
+++ b/cookbooks/docker-grid/recipes/registry-server.rb
@@ -64,9 +64,10 @@ directory config['storage']['filesystem']['rootdirectory'] do
 end
 
 if node['docker-grid']['registry']['with_ssl_cert_cookbook']
-  include_recipe 'ssl_cert::server_key_pairs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
   cn = node['docker-grid']['registry']['ssl_cert']['common_name']
+  append_server_ssl_cn(cn)
+  include_recipe 'ssl_cert::server_key_pairs'
 
   append_members_to_key_access_group(service_owner)
   override_config['http']['tls']['certificate'] = server_cert_path(cn)
diff --git a/cookbooks/docker-grid/recipes/registry.rb b/cookbooks/docker-grid/recipes/registry.rb
index b48c169..6f30712 100644
--- a/cookbooks/docker-grid/recipes/registry.rb
+++ b/cookbooks/docker-grid/recipes/registry.rb
@@ -53,9 +53,10 @@ unless host_data_volume.nil?
 end
 
 if node['docker-grid']['registry']['with_ssl_cert_cookbook']
-  include_recipe 'ssl_cert::server_key_pairs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
   cn = node['docker-grid']['registry']['ssl_cert']['common_name']
+  append_server_ssl_cn(cn)
+  include_recipe 'ssl_cert::server_key_pairs'
 
   envs['REGISTRY_HTTP_TLS_CERTIFICATE'] = '/certs/domain.crt'
   envs['REGISTRY_HTTP_TLS_KEY'] = '/certs/domain.key'
diff --git a/cookbooks/docker-grid/version b/cookbooks/docker-grid/version
index cb0c939..be14282 100644
--- a/cookbooks/docker-grid/version
+++ b/cookbooks/docker-grid/version
@@ -1 +1 @@
-0.5.2
+0.5.3
-- 
2.11.0