| Revisión | 12f55cf7add9b67345e80e0c1139161a94ff7f3a (tree) |
|---|---|
| Tiempo | 2017-09-05 22:26:05 |
| Autor | whitestar <whitestar@user...> |
| Commiter | whitestar |
improves server key pair deployment.
cookbooks/jenkins-grid/CHANGELOG.md (diff) cookbooks/jenkins-grid/README.md (diff) cookbooks/jenkins-grid/metadata.rb (diff) cookbooks/jenkins-grid/recipes/docker-compose.rb (diff) cookbooks/jenkins-grid/version (diff)| @@ -1,5 +1,9 @@ | ||
| 1 | 1 | # jenkins-grid CHANGELOG |
| 2 | 2 | |
| 3 | +0.2.8 | |
| 4 | +----- | |
| 5 | +- improves server key pair deployment. | |
| 6 | + | |
| 3 | 7 | 0.2.7 |
| 4 | 8 | ----- |
| 5 | 9 | - improves SSL server key management. |
| @@ -105,7 +105,7 @@ name 'jenkins-with-ssl-cert' | ||
| 105 | 105 | description 'Jenkins setup with ssl_cert cookbook' |
| 106 | 106 | |
| 107 | 107 | run_list( |
| 108 | - #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid <= 0.2.3 | |
| 108 | + #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid cookbook < 0.2.4 | |
| 109 | 109 | 'role[docker]', |
| 110 | 110 | 'recipe[jenkins-grid::docker-compose]', |
| 111 | 111 | ) |
| @@ -117,6 +117,11 @@ run_list( | ||
| 117 | 117 | jenkins_cn = 'jenkins.io.example.com' |
| 118 | 118 | |
| 119 | 119 | override_attributes( |
| 120 | + 'ssl_cert' => { | |
| 121 | + #'common_names' => [ | |
| 122 | + # jenkins_cn, # jenkins-grid cookbook < 0.2.8 | |
| 123 | + #], | |
| 124 | + }, | |
| 120 | 125 | 'jenkins-grid' => { |
| 121 | 126 | 'with_ssl_cert_cookbook' => true, |
| 122 | 127 | 'ssl_cert' => { |
| @@ -156,11 +161,6 @@ override_attributes( | ||
| 156 | 161 | }, |
| 157 | 162 | }, |
| 158 | 163 | }, |
| 159 | - 'ssl_cert' => { | |
| 160 | - 'common_names' => [ | |
| 161 | - jenkins_cn, | |
| 162 | - ], | |
| 163 | - } | |
| 164 | 164 | ) |
| 165 | 165 | ``` |
| 166 | 166 |
| @@ -195,15 +195,15 @@ $ knife vault update ssl_server_certs jenkins.io.example.com.prod -S 'name:jenki | ||
| 195 | 195 | |
| 196 | 196 | ```ruby |
| 197 | 197 | run_list( |
| 198 | - #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid <= 0.2.3 | |
| 198 | + #'recipe[ssl_cert::server_key_pairs]', # jenkins-grid < 0.2.4 | |
| 199 | 199 | 'recipe[jenkins-grid::docker-compose]', |
| 200 | 200 | ) |
| 201 | 201 | |
| 202 | 202 | override_attributes( |
| 203 | 203 | 'ssl_cert' => { |
| 204 | - 'common_names' => [ | |
| 205 | - 'jenkins.io.example.com', | |
| 206 | - ], | |
| 204 | + #'common_names' => [ | |
| 205 | + # 'jenkins.io.example.com', # jenkins-grid cookbook < 0.2.8 | |
| 206 | + #], | |
| 207 | 207 | }, |
| 208 | 208 | 'jenkins-grid' => { |
| 209 | 209 | 'with_ssl_cert_cookbook' => true, |
| @@ -18,4 +18,4 @@ supports 'ubuntu', '>= 14.04' | ||
| 18 | 18 | end |
| 19 | 19 | |
| 20 | 20 | depends 'docker-grid', '>= 0.3.6' |
| 21 | -depends 'ssl_cert', '>= 0.3.3' | |
| 21 | +depends 'ssl_cert', '>= 0.4.1' |
| @@ -70,9 +70,10 @@ unless jenkins_home_path.nil? | ||
| 70 | 70 | end |
| 71 | 71 | |
| 72 | 72 | if node['jenkins-grid']['with_ssl_cert_cookbook'] |
| 73 | - include_recipe 'ssl_cert::server_key_pairs' | |
| 74 | 73 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
| 75 | 74 | cn = node['jenkins-grid']['ssl_cert']['common_name'] |
| 75 | + append_server_ssl_cn(cn) | |
| 76 | + include_recipe 'ssl_cert::server_key_pairs' | |
| 76 | 77 | key_path = server_key_path(cn) |
| 77 | 78 | |
| 78 | 79 | bash 'copy_ssl_server_key_for_jenkins' do |
| @@ -1 +1 @@ | ||
| 1 | -0.2.7 | |
| 1 | +0.2.8 |
Fork