• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

Grid環境構築用のChefリポジトリです。


コミットメタ情報

リビジョン171ee19dc293b6d505cda75794f323c32e32d000 (tree)
日時2017-09-05 22:30:47
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

improves server key pair deployment.

変更サマリ

差分

--- a/cookbooks/nexus-grid/CHANGELOG.md
+++ b/cookbooks/nexus-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
11 # nexus-grid CHANGELOG
22
3+0.1.4
4+-----
5+- improves server key pair deployment.
6+
37 0.1.3
48 -----
59 - includes the `ssl_cert::server_key_pairs` recipe automatically.
--- a/cookbooks/nexus-grid/README.md
+++ b/cookbooks/nexus-grid/README.md
@@ -125,7 +125,7 @@ name 'nexus-with-ssl'
125125 description 'Nexus with SSL by reverse proxy (nginx)'
126126
127127 run_list(
128- #'recipe[ssl_cert::server_key_pairs]', # nexus-grid <= 0.1.2
128+ #'recipe[ssl_cert::server_key_pairs]', # nexus-grid cookbook < 0.1.3
129129 'role[docker]',
130130 'recipe[nexus-grid::docker-compose]',
131131 )
@@ -137,9 +137,9 @@ cn = 'nexus.io.example.com'
137137
138138 override_attributes(
139139 'ssl_cert' => {
140- 'common_names' => [
141- cn,
142- ],
140+ #'common_names' => [
141+ # cn, # nexus-grid cookbook < 0.1.4
142+ #],
143143 },
144144 'nexus-grid' => {
145145 'with_ssl_cert_cookbook' => true,
@@ -221,15 +221,15 @@ $ knife vault update ssl_server_certs nexus.io.example.com.prod -S 'name:nexus-h
221221
222222 ```ruby
223223 run_list(
224- #'recipe[ssl_cert::server_key_pairs]', # nexus-grid <= 0.1.2
224+ #'recipe[ssl_cert::server_key_pairs]', # nexus-grid cookbook < 0.1.3
225225 'recipe[nexus-grid::docker-compose]',
226226 )
227227
228228 override_attributes(
229229 'ssl_cert' => {
230- 'common_names' => [
231- 'nexus.io.example.com',
232- ],
230+ #'common_names' => [
231+ # 'nexus.io.example.com', # nexus-grid cookbook < 0.1.4
232+ #],
233233 },
234234 'nexus-grid' => {
235235 'with_ssl_cert_cookbook' => true,
--- a/cookbooks/nexus-grid/metadata.rb
+++ b/cookbooks/nexus-grid/metadata.rb
@@ -17,4 +17,4 @@ supports 'ubuntu', '>= 14.04'
1717
1818 depends 'docker-grid', '>= 0.2.7'
1919 depends 'platform_utils', '>= 0.4.3'
20-depends 'ssl_cert', '>= 0.3.7'
20+depends 'ssl_cert', '>= 0.4.1'
--- a/cookbooks/nexus-grid/recipes/docker-compose.rb
+++ b/cookbooks/nexus-grid/recipes/docker-compose.rb
@@ -76,9 +76,10 @@ container_data_dir = nexus_ver == '3' ? '/nexus-data' : '/sonatype-work'
7676 nexus_vols.push("#{data_dir}:#{container_data_dir}:rw") if !data_dir.nil? && !data_dir.empty?
7777
7878 if node['nexus-grid']['with_ssl_cert_cookbook']
79- include_recipe 'ssl_cert::server_key_pairs'
8079 ::Chef::Recipe.send(:include, SSLCert::Helper)
8180 cn = node['nexus-grid']['ssl_cert']['common_name']
81+ append_server_ssl_cn(cn)
82+ include_recipe 'ssl_cert::server_key_pairs'
8283 # Nginx parent process owner is root.
8384 rproxy_vols.push("#{server_cert_path(cn)}:/root/server.crt:ro")
8485 rproxy_vols.push("#{server_key_path(cn)}:/root/server.key:ro")
@@ -125,9 +126,9 @@ end
125126 log <<-"EOM"
126127 Note: You must execute the following command manually.
127128 See #{doc_url}
128- - Start:
129+ * Start:
129130 $ cd #{app_dir}
130131 $ docker-compose up -d
131- - Stop
132+ * Stop
132133 $ docker-compose down
133134 EOM
--- a/cookbooks/nexus-grid/version
+++ b/cookbooks/nexus-grid/version
@@ -1 +1 @@
1-0.1.3
1+0.1.4
旧リポジトリブラウザで表示