From 91e572df496d0d98813cdffa578d546005b6dad8 Mon Sep 17 00:00:00 2001
From: whitestar <whitestar@users.osdn.me>
Date: Sun, 6 Aug 2017 12:43:43 +0900
Subject: [PATCH] includes the `ssl_cert::server_key_pairs` recipe
 automatically.

---
 cookbooks/nexus-grid/CHANGELOG.md              | 4 ++++
 cookbooks/nexus-grid/README.md                 | 4 ++--
 cookbooks/nexus-grid/recipes/docker-compose.rb | 1 +
 cookbooks/nexus-grid/version                   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cookbooks/nexus-grid/CHANGELOG.md b/cookbooks/nexus-grid/CHANGELOG.md
index f3b786e..57c0e47 100644
--- a/cookbooks/nexus-grid/CHANGELOG.md
+++ b/cookbooks/nexus-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nexus-grid CHANGELOG
 
+0.1.3
+-----
+- includes the `ssl_cert::server_key_pairs` recipe automatically.
+
 0.1.2
 -----
 - adds the Nexus 2 support.
diff --git a/cookbooks/nexus-grid/README.md b/cookbooks/nexus-grid/README.md
index 97af9a5..670574d 100644
--- a/cookbooks/nexus-grid/README.md
+++ b/cookbooks/nexus-grid/README.md
@@ -125,7 +125,7 @@ name 'nexus-with-ssl'
 description 'Nexus with SSL by reverse proxy (nginx)'
 
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # nexus-grid <= 0.1.2
   'role[docker]',
   'recipe[nexus-grid::docker-compose]',
 )
@@ -221,7 +221,7 @@ $ knife vault update ssl_server_certs nexus.io.example.com.prod -S 'name:nexus-h
 
 ```ruby
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # nexus-grid <= 0.1.2
   'recipe[nexus-grid::docker-compose]',
 )
 
diff --git a/cookbooks/nexus-grid/recipes/docker-compose.rb b/cookbooks/nexus-grid/recipes/docker-compose.rb
index 3f29d06..4e66658 100644
--- a/cookbooks/nexus-grid/recipes/docker-compose.rb
+++ b/cookbooks/nexus-grid/recipes/docker-compose.rb
@@ -76,6 +76,7 @@ container_data_dir = nexus_ver == '3' ? '/nexus-data' : '/sonatype-work'
 nexus_vols.push("#{data_dir}:#{container_data_dir}:rw") if !data_dir.nil? && !data_dir.empty?
 
 if node['nexus-grid']['with_ssl_cert_cookbook']
+  include_recipe 'ssl_cert::server_key_pairs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
   cn = node['nexus-grid']['ssl_cert']['common_name']
   # Nginx parent process owner is root.
diff --git a/cookbooks/nexus-grid/version b/cookbooks/nexus-grid/version
index d917d3e..b1e80bb 100644
--- a/cookbooks/nexus-grid/version
+++ b/cookbooks/nexus-grid/version
@@ -1 +1 @@
-0.1.2
+0.1.3
-- 
2.11.0