includes the `ssl_cert::server_key_pairs` and `ssl_cert::ca_certs` recipes automatically.

diff --git a/cookbooks/gitlab-grid/CHANGELOG.md b/cookbooks/gitlab-grid/CHANGELOG.md
index 199773d..8d064f2 100644 (file)
--- a/cookbooks/gitlab-grid/CHANGELOG.md
+++ b/cookbooks/gitlab-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # gitlab-grid CHANGELOG
 
+0.1.4
+-----
+- includes the `ssl_cert::server_key_pairs` and `ssl_cert::ca_certs` recipes automatically.
+
 0.1.3
 -----
 - adds the `gitlab-grid::docker-compose` recipe.

diff --git a/cookbooks/gitlab-grid/README.md b/cookbooks/gitlab-grid/README.md
index d181625..aaee427 100644 (file)
--- a/cookbooks/gitlab-grid/README.md
+++ b/cookbooks/gitlab-grid/README.md
@@ -102,7 +102,7 @@ name 'gitlab-with-ssl-cert'
 description 'GitLab setup with ssl_cert cookbook'
 
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # gitlab-grid <= 0.1.3
   'recipe[gitlab-grid::server]',
 )
 
@@ -204,7 +204,7 @@ gitlab_ssh_port = '2022'
 gitlab_registry_port = '5050'
 
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # gitlab-grid <= 0.1.3
   'role[docker]',
   'recipe[gitlab-grid::docker-compose]',
 )
@@ -277,7 +277,7 @@ name 'gitlab-runner'
 description 'GitLab-runner'
 
 run_list(
-  #'recipe[ssl_cert::ca_certs]',
+  #'recipe[ssl_cert::ca_certs]',  # gitlab-grid <= 0.1.3
   'role[docker]',
   'recipe[gitlab-grid::runner-docker-compose]',
 )
@@ -351,7 +351,7 @@ $ knife vault update ssl_server_certs gitlab.io.example.com.prod -S 'name:gitlab
 
 ```ruby
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # gitlab-grid <= 0.1.3
   'recipe[gitlab-grid::server]',
   #'recipe[gitlab-grid::docker-compose]',
 )

diff --git a/cookbooks/gitlab-grid/recipes/commons.rb b/cookbooks/gitlab-grid/recipes/commons.rb
index 19b63b9..4b4f6f7 100644 (file)
--- a/cookbooks/gitlab-grid/recipes/commons.rb
+++ b/cookbooks/gitlab-grid/recipes/commons.rb
@@ -22,7 +22,9 @@ gitlab_rb = node['gitlab-grid']['gitlab.rb']
 force_override_gitlab_rb = node.force_override['gitlab-grid']['gitlab.rb']
 
 if node['gitlab-grid']['with_ssl_cert_cookbook']
+  include_recipe 'ssl_cert::server_key_pairs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
+
   # GitLab
   cn = node['gitlab-grid']['ssl_cert']['common_name']
   cert_path = server_cert_path(cn)

diff --git a/cookbooks/gitlab-grid/recipes/docker-compose.rb b/cookbooks/gitlab-grid/recipes/docker-compose.rb
index 29ec438..b15a05c 100644 (file)
--- a/cookbooks/gitlab-grid/recipes/docker-compose.rb
+++ b/cookbooks/gitlab-grid/recipes/docker-compose.rb
@@ -39,6 +39,8 @@ envs = {}
 vols = config['services']['gitlab']['volumes'].to_a
 
 if node['gitlab-grid']['with_ssl_cert_cookbook']
+  include_recipe 'ssl_cert::server_key_pairs'
+
   # GitLab
   # These paths are already set in the `gitlab-grid::commons` recipe.
   cert_path = force_override_gitlab_rb['nginx']['ssl_certificate']

diff --git a/cookbooks/gitlab-grid/recipes/runner-docker-compose.rb b/cookbooks/gitlab-grid/recipes/runner-docker-compose.rb
index f6dff11..a8c2444 100644 (file)
--- a/cookbooks/gitlab-grid/recipes/runner-docker-compose.rb
+++ b/cookbooks/gitlab-grid/recipes/runner-docker-compose.rb
@@ -48,6 +48,7 @@ vols = config['services']['runner']['volumes'].to_a
 vols.push("#{etc_dir}:/etc/gitlab-runner")
 
 if node['gitlab-grid']['with_ssl_cert_cookbook'] && node['gitlab-grid']['runner-docker-compose']['import_ca']
+  include_recipe 'ssl_cert::ca_certs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
   vols.push("#{ca_cert_path(node['gitlab-grid']['ssl_cert']['ca_name'])}:/etc/gitlab-runner/certs/ca.crt:ro")
 end

diff --git a/cookbooks/gitlab-grid/version b/cookbooks/gitlab-grid/version
index b1e80bb..845639e 100644 (file)
--- a/cookbooks/gitlab-grid/version
+++ b/cookbooks/gitlab-grid/version
@@ -1 +1 @@
-0.1.3
+0.1.4