| Revisión | 10b1313e7715a77f0a899006870ccead4fe614f3 (tree) |
|---|---|
| Tiempo | 2017-09-05 22:03:01 |
| Autor | whitestar <whitestar@user...> |
| Commiter | whitestar |
improves server key pair deployment for a Docker registry service.
cookbooks/docker-grid/CHANGELOG.md (diff) cookbooks/docker-grid/metadata.rb (diff) cookbooks/docker-grid/recipes/registry-server.rb (diff) cookbooks/docker-grid/recipes/registry.rb (diff) cookbooks/docker-grid/version (diff)| @@ -1,5 +1,9 @@ | ||
| 1 | 1 | # docker-grid CHANGELOG |
| 2 | 2 | |
| 3 | +0.5.3 | |
| 4 | +----- | |
| 5 | +- improves server key pair deployment for a Docker registry service. | |
| 6 | + | |
| 3 | 7 | 0.5.2 |
| 4 | 8 | ----- |
| 5 | 9 | - adds the `docker_volumes_cleanup` script. |
| @@ -18,4 +18,4 @@ supports 'debian', '>= 9.0' | ||
| 18 | 18 | supports 'ubuntu', '>= 14.04' |
| 19 | 19 | |
| 20 | 20 | depends 'platform_utils', '>= 0.4.4' |
| 21 | -depends 'ssl_cert', '>= 0.3.2' | |
| 21 | +depends 'ssl_cert', '>= 0.4.1' |
| @@ -64,9 +64,10 @@ directory config['storage']['filesystem']['rootdirectory'] do | ||
| 64 | 64 | end |
| 65 | 65 | |
| 66 | 66 | if node['docker-grid']['registry']['with_ssl_cert_cookbook'] |
| 67 | - include_recipe 'ssl_cert::server_key_pairs' | |
| 68 | 67 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
| 69 | 68 | cn = node['docker-grid']['registry']['ssl_cert']['common_name'] |
| 69 | + append_server_ssl_cn(cn) | |
| 70 | + include_recipe 'ssl_cert::server_key_pairs' | |
| 70 | 71 | |
| 71 | 72 | append_members_to_key_access_group(service_owner) |
| 72 | 73 | override_config['http']['tls']['certificate'] = server_cert_path(cn) |
| @@ -53,9 +53,10 @@ unless host_data_volume.nil? | ||
| 53 | 53 | end |
| 54 | 54 | |
| 55 | 55 | if node['docker-grid']['registry']['with_ssl_cert_cookbook'] |
| 56 | - include_recipe 'ssl_cert::server_key_pairs' | |
| 57 | 56 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
| 58 | 57 | cn = node['docker-grid']['registry']['ssl_cert']['common_name'] |
| 58 | + append_server_ssl_cn(cn) | |
| 59 | + include_recipe 'ssl_cert::server_key_pairs' | |
| 59 | 60 | |
| 60 | 61 | envs['REGISTRY_HTTP_TLS_CERTIFICATE'] = '/certs/domain.crt' |
| 61 | 62 | envs['REGISTRY_HTTP_TLS_KEY'] = '/certs/domain.key' |
| @@ -1 +1 @@ | ||
| 1 | -0.5.2 | |
| 1 | +0.5.3 |
Fork