| Revision | 05325099beefccc46452aabe32f3391658042ed8 (tree) |
|---|---|
| Time | 2017-08-06 12:14:06 |
| Author | whitestar <whitestar@user...> |
| Commiter | whitestar |
includes the ssl_cert::server_key_pairs and ssl_cert::ca_certs recipes automatically.
cookbooks/gitlab-grid/CHANGELOG.md (diff) cookbooks/gitlab-grid/README.md (diff) cookbooks/gitlab-grid/recipes/commons.rb (diff) cookbooks/gitlab-grid/recipes/docker-compose.rb (diff) cookbooks/gitlab-grid/recipes/runner-docker-compose.rb (diff) cookbooks/gitlab-grid/version (diff)| @@ -1,5 +1,9 @@ | ||
| 1 | 1 | # gitlab-grid CHANGELOG |
| 2 | 2 | |
| 3 | +0.1.4 | |
| 4 | +----- | |
| 5 | +- includes the `ssl_cert::server_key_pairs` and `ssl_cert::ca_certs` recipes automatically. | |
| 6 | + | |
| 3 | 7 | 0.1.3 |
| 4 | 8 | ----- |
| 5 | 9 | - adds the `gitlab-grid::docker-compose` recipe. |
| @@ -102,7 +102,7 @@ name 'gitlab-with-ssl-cert' | ||
| 102 | 102 | description 'GitLab setup with ssl_cert cookbook' |
| 103 | 103 | |
| 104 | 104 | run_list( |
| 105 | - 'recipe[ssl_cert::server_key_pairs]', | |
| 105 | + #'recipe[ssl_cert::server_key_pairs]', # gitlab-grid <= 0.1.3 | |
| 106 | 106 | 'recipe[gitlab-grid::server]', |
| 107 | 107 | ) |
| 108 | 108 |
| @@ -204,7 +204,7 @@ gitlab_ssh_port = '2022' | ||
| 204 | 204 | gitlab_registry_port = '5050' |
| 205 | 205 | |
| 206 | 206 | run_list( |
| 207 | - 'recipe[ssl_cert::server_key_pairs]', | |
| 207 | + #'recipe[ssl_cert::server_key_pairs]', # gitlab-grid <= 0.1.3 | |
| 208 | 208 | 'role[docker]', |
| 209 | 209 | 'recipe[gitlab-grid::docker-compose]', |
| 210 | 210 | ) |
| @@ -277,7 +277,7 @@ name 'gitlab-runner' | ||
| 277 | 277 | description 'GitLab-runner' |
| 278 | 278 | |
| 279 | 279 | run_list( |
| 280 | - #'recipe[ssl_cert::ca_certs]', | |
| 280 | + #'recipe[ssl_cert::ca_certs]', # gitlab-grid <= 0.1.3 | |
| 281 | 281 | 'role[docker]', |
| 282 | 282 | 'recipe[gitlab-grid::runner-docker-compose]', |
| 283 | 283 | ) |
| @@ -351,7 +351,7 @@ $ knife vault update ssl_server_certs gitlab.io.example.com.prod -S 'name:gitlab | ||
| 351 | 351 | |
| 352 | 352 | ```ruby |
| 353 | 353 | run_list( |
| 354 | - 'recipe[ssl_cert::server_key_pairs]', | |
| 354 | + #'recipe[ssl_cert::server_key_pairs]', # gitlab-grid <= 0.1.3 | |
| 355 | 355 | 'recipe[gitlab-grid::server]', |
| 356 | 356 | #'recipe[gitlab-grid::docker-compose]', |
| 357 | 357 | ) |
| @@ -22,7 +22,9 @@ gitlab_rb = node['gitlab-grid']['gitlab.rb'] | ||
| 22 | 22 | force_override_gitlab_rb = node.force_override['gitlab-grid']['gitlab.rb'] |
| 23 | 23 | |
| 24 | 24 | if node['gitlab-grid']['with_ssl_cert_cookbook'] |
| 25 | + include_recipe 'ssl_cert::server_key_pairs' | |
| 25 | 26 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
| 27 | + | |
| 26 | 28 | # GitLab |
| 27 | 29 | cn = node['gitlab-grid']['ssl_cert']['common_name'] |
| 28 | 30 | cert_path = server_cert_path(cn) |
| @@ -39,6 +39,8 @@ envs = {} | ||
| 39 | 39 | vols = config['services']['gitlab']['volumes'].to_a |
| 40 | 40 | |
| 41 | 41 | if node['gitlab-grid']['with_ssl_cert_cookbook'] |
| 42 | + include_recipe 'ssl_cert::server_key_pairs' | |
| 43 | + | |
| 42 | 44 | # GitLab |
| 43 | 45 | # These paths are already set in the `gitlab-grid::commons` recipe. |
| 44 | 46 | cert_path = force_override_gitlab_rb['nginx']['ssl_certificate'] |
| @@ -48,6 +48,7 @@ vols = config['services']['runner']['volumes'].to_a | ||
| 48 | 48 | vols.push("#{etc_dir}:/etc/gitlab-runner") |
| 49 | 49 | |
| 50 | 50 | if node['gitlab-grid']['with_ssl_cert_cookbook'] && node['gitlab-grid']['runner-docker-compose']['import_ca'] |
| 51 | + include_recipe 'ssl_cert::ca_certs' | |
| 51 | 52 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
| 52 | 53 | vols.push("#{ca_cert_path(node['gitlab-grid']['ssl_cert']['ca_name'])}:/etc/gitlab-runner/certs/ca.crt:ro") |
| 53 | 54 | end |
| @@ -1 +1 @@ | ||
| 1 | -0.1.3 | |
| 1 | +0.1.4 |
Fork