| Révision | da8b73d8b47644a3980d7ba1810f58e901a939f5 (tree) |
|---|---|
| l'heure | 2017-08-06 16:41:53 |
| Auteur | whitestar <whitestar@user...> |
| Commiter | whitestar |
includes the ssl_cert::server_key_pairs recipe in the apt_utils::aptly and apt_utils::aptly-docker-compose recipes automatically.
cookbooks/apt_utils/CHANGELOG.md (diff) cookbooks/apt_utils/README.md (diff) cookbooks/apt_utils/recipes/aptly-docker-compose.rb (diff) cookbooks/apt_utils/recipes/aptly.rb (diff) cookbooks/apt_utils/version (diff)| @@ -1,6 +1,10 @@ | ||
| 1 | 1 | apt_utils CHANGELOG |
| 2 | 2 | =================== |
| 3 | 3 | |
| 4 | +0.2.4 | |
| 5 | +----- | |
| 6 | +- includes the `ssl_cert::server_key_pairs` recipe in the `apt_utils::aptly` and `apt_utils::aptly-docker-compose` recipes automatically. | |
| 7 | + | |
| 4 | 8 | 0.2.3 |
| 5 | 9 | ----- |
| 6 | 10 | - adds a reverse proxy (nginx) service with SSL setup feature to the `apt_utils::aptly-docker-compose` recipe. |
| @@ -149,7 +149,7 @@ name 'aptly-with-ssl-docker-compose' | ||
| 149 | 149 | description 'aptly with SSL by docker-compose' |
| 150 | 150 | |
| 151 | 151 | run_list( |
| 152 | - 'recipe[ssl_cert::server_key_pairs]', | |
| 152 | + #'recipe[ssl_cert::server_key_pairs]', # apt_utils <= 0.2.3 | |
| 153 | 153 | 'role[docker]', |
| 154 | 154 | 'recipe[apt_utils::aptly-docker-compose]', |
| 155 | 155 | ) |
| @@ -234,7 +234,7 @@ $ knife vault update ssl_server_certs aptly.io.example.com.prod -S 'name:aptly-h | ||
| 234 | 234 | |
| 235 | 235 | ```ruby |
| 236 | 236 | run_list( |
| 237 | - 'recipe[ssl_cert::server_key_pairs]', | |
| 237 | + #'recipe[ssl_cert::server_key_pairs]', # apt_utils <= 0.2.3 | |
| 238 | 238 | 'recipe[apt_utils::aptly-docker-compose]', |
| 239 | 239 | ) |
| 240 | 240 |
| @@ -86,7 +86,9 @@ if !data_dir.nil? && !data_dir.empty? | ||
| 86 | 86 | end |
| 87 | 87 | |
| 88 | 88 | if node['apt_utils']['aptly']['with_ssl_cert_cookbook'] |
| 89 | + include_recipe 'ssl_cert::server_key_pairs' | |
| 89 | 90 | ::Chef::Recipe.send(:include, SSLCert::Helper) |
| 91 | + | |
| 90 | 92 | cn = node['apt_utils']['aptly']['ssl_cert']['common_name'] |
| 91 | 93 | # Concourse web process owner is root. |
| 92 | 94 | rproxy_vols.push("#{server_cert_path(cn)}:/root/server.crt:ro") |
| @@ -74,3 +74,5 @@ directory node['apt_utils']['aptly']['conf']['rootDir'] do | ||
| 74 | 74 | mode '0755' |
| 75 | 75 | action :create |
| 76 | 76 | end |
| 77 | + | |
| 78 | +include_recipe 'ssl_cert::server_key_pairs' if node['apt_utils']['aptly']['with_ssl_cert_cookbook'] |
| @@ -1 +1 @@ | ||
| 1 | -0.2.3 | |
| 1 | +0.2.4 |
Fork