OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

grid-chef-repo: Commit

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


Commit MetaInfo

Revision78d08b025abd8b08a7b185c61fe851d3cf2738f6 (tree)
Zeit2017-08-06 16:13:16
Autorwhitestar <whitestar@user...>
Commiterwhitestar

Log Message

includes the ssl_cert::server_key_pairs and ssl_cert::ca_certs recipes automatically.

Ändern Zusammenfassung

Diff

--- a/cookbooks/concourse-ci/CHANGELOG.md
+++ b/cookbooks/concourse-ci/CHANGELOG.md
@@ -1,6 +1,10 @@
11 concourse-ci CHANGELOG
22 ======================
33
4+0.2.2
5+-----
6+- includes the `ssl_cert::server_key_pairs` and `ssl_cert::ca_certs` recipes automatically.
7+
48 0.2.1
59 -----
610 - refactoring.
--- a/cookbooks/concourse-ci/README.md
+++ b/cookbooks/concourse-ci/README.md
@@ -37,7 +37,7 @@ This cookbook sets up a Concourse CI service by Docker Compose.
3737
3838 |Key|Type|Description, example|Default|
3939 |:--|:--|:--|:--|
40-|`['concourse-ci']['fly']['version']`|String||`'2.7.0'`|
40+|`['concourse-ci']['fly']['version']`|String||`'3.3.4'`|
4141 |`['concourse-ci']['fly']['release_url']`|String||`"https://github.com/concourse/concourse/releases/download/v#{node['concourse-ci']['fly']['version']}/fly_linux_amd64"`|
4242 |`['concourse-ci']['fly']['release_checksum']`|String||`nil`|
4343 |`['concourse-ci']['fly']['auto_upgrade']`|Boolean||`false`|
@@ -92,7 +92,7 @@ run_list(
9292 'recipe[concourse-ci::docker-compose]',
9393 )
9494
95-image = 'concourse/concourse:2.7.0'
95+image = 'concourse/concourse:latest'
9696 port = '18080'
9797
9898 override_attributes(
@@ -134,7 +134,7 @@ name 'concourse-with-ssl'
134134 description 'Concourse with SSL'
135135
136136 run_list(
137- 'recipe[ssl_cert::server_key_pairs]',
137+ #'recipe[ssl_cert::server_key_pairs]', # concourse-ci <= 0.2.1
138138 'role[docker]',
139139 'recipe[concourse-ci::docker-compose]',
140140 )
@@ -196,13 +196,13 @@ name 'concourse-with-oauth'
196196 description 'Concourse with OAuth'
197197
198198 run_list(
199- 'recipe[ssl_cert::ca_certs]',
199+ #'recipe[ssl_cert::ca_certs]', # concourse-ci <= 0.2.1
200200 'recipe[ssl_cert::server_key_pairs]',
201201 'role[docker]',
202202 'recipe[concourse-ci::docker-compose]',
203203 )
204204
205-image = 'concourse/concourse:2.7.0'
205+image = 'concourse/concourse:latest'
206206 port = '18443'
207207 ca_name = 'grid_ca'
208208 cn = 'concourse.io.example.com'
@@ -270,19 +270,19 @@ override_attributes(
270270 - create vault items.
271271
272272 ```text
273-$ ruby -rjson -e 'puts JSON.generate({"private" => File.read("concourse_io_example_com.prod.key")})' \
274-> > ~/tmp/concourse_io_example_com.prod.key.json
273+$ ruby -rjson -e 'puts JSON.generate({"private" => File.read("concourse.io.example.com.prod.key")})' \
274+> > ~/tmp/concourse.io.example.com.prod.key.json
275275
276-$ ruby -rjson -e 'puts JSON.generate({"public" => File.read("concourse_io_example_com.prod.crt")})' \
277-> > ~/tmp/concourse_io_example_com.prod.crt.json
276+$ ruby -rjson -e 'puts JSON.generate({"public" => File.read("concourse.io.example.com.prod.crt")})' \
277+> > ~/tmp/concourse.io.example.com.prod.crt.json
278278
279279 $ cd $CHEF_REPO_PATH
280280
281281 $ knife vault create ssl_server_keys concourse.io.example.com.prod \
282-> --json ~/tmp/concourse_io_example_com.prod.key.json
282+> --json ~/tmp/concourse.io.example.com.prod.key.json
283283
284284 $ knife vault create ssl_server_certs concourse.io.example.com.prod \
285-> --json ~/tmp/concourse_io_example_com.prod.crt.json
285+> --json ~/tmp/concourse.io.example.com.prod.crt.json
286286 ```
287287
288288 - grant reference permission to the Concourse host
@@ -296,7 +296,7 @@ $ knife vault update ssl_server_certs concourse.io.example.com.prod -S 'name:con
296296
297297 ```ruby
298298 run_list(
299- 'recipe[ssl_cert::server_key_pairs]',
299+ #'recipe[ssl_cert::server_key_pairs]', # concourse-ci <= 0.2.1
300300 'recipe[concourse-ci::docker-compose]',
301301 )
302302
--- a/cookbooks/concourse-ci/attributes/default.rb
+++ b/cookbooks/concourse-ci/attributes/default.rb
@@ -17,7 +17,7 @@
1717 # limitations under the License.
1818 #
1919
20-default['concourse-ci']['fly']['version'] = '2.7.0'
20+default['concourse-ci']['fly']['version'] = '3.3.4'
2121 default['concourse-ci']['fly']['release_url'] = "https://github.com/concourse/concourse/releases/download/v#{node['concourse-ci']['fly']['version']}/fly_linux_amd64"
2222 default['concourse-ci']['fly']['release_checksum'] = nil
2323 default['concourse-ci']['fly']['auto_upgrade'] = false
--- a/cookbooks/concourse-ci/concourse.yml
+++ b/cookbooks/concourse-ci/concourse.yml
@@ -1,19 +1,8 @@
11 ---
22 # $ fly -t target sp -p concourse-ci-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml
3-resource_types:
4-- name: ya-git
5- type: docker-image
6- source:
7- repository: whitestar/git-resource
8- registry_mirror: https://((registry-mirror-domain))
9- ca_certs:
10- - domain: ((registry-mirror-domain))
11- cert: ((docker-reg-ca-cert))
12-
133 resources:
144 - name: src-git
15- type: ya-git
16- #type: git
5+ type: git
176 source:
187 uri: ((git-id-osdn))@git.osdn.net:/gitroot/metasearch/grid-chef-repo.git
198 branch: master
@@ -35,7 +24,7 @@ resources:
3524 check_every: 12h # default: 1m
3625
3726 jobs:
38-- name: build-cookbook
27+- name: test-cookbook
3928 plan:
4029 - aggregate:
4130 - get: src-git
@@ -79,7 +68,9 @@ jobs:
7968 params:
8069 depth: 5
8170 trigger: false
71+ passed: [test-cookbook]
8272 - get: chefdk-cache
73+ passed: [test-cookbook]
8374 - task: publish
8475 image: chefdk-cache
8576 params:
@@ -106,5 +97,4 @@ jobs:
10697 tag_prefix: ((cookbook-name))-
10798 tag: src-git/cookbooks/((cookbook-name))/version
10899 only_tag: true
109- annotate: src-git/cookbooks/((cookbook-name))/version
110- #annotate: # path to a file containing the annotation message.
100+ annotate: ../src-git/cookbooks/((cookbook-name))/version
--- a/cookbooks/concourse-ci/recipes/docker-compose.rb
+++ b/cookbooks/concourse-ci/recipes/docker-compose.rb
@@ -17,8 +17,6 @@
1717 # limitations under the License.
1818 #
1919
20-::Chef::Recipe.send(:include, SSLCert::Helper)
21-
2220 require 'securerandom'
2321
2422 doc_url = 'https://concourse.ci/docker-repository.html'
@@ -220,7 +218,9 @@ template "#{bin_dir}/concourse_up" do
220218 end
221219
222220 if node['concourse-ci']['with_ssl_cert_cookbook']
221+ include_recipe 'ssl_cert::server_key_pairs'
223222 ::Chef::Recipe.send(:include, SSLCert::Helper)
223+
224224 cn = node['concourse-ci']['ssl_cert']['common_name']
225225 # Concourse web process owner is root.
226226 web_vols.push("#{server_cert_path(cn)}:/root/server.crt:ro")
@@ -235,7 +235,9 @@ worker_vols.push("#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/
235235
236236 # Common
237237 if node['concourse-ci']['docker-compose']['import_ca']
238+ include_recipe 'ssl_cert::ca_certs'
238239 ::Chef::Recipe.send(:include, SSLCert::Helper)
240+
239241 node['concourse-ci']['ssl_cert']['ca_names'].each {|ca_name|
240242 ca_cert_vol = "#{ca_cert_path(ca_name)}:/usr/share/ca-certificates/#{ca_name}.crt:ro"
241243 web_vols.push(ca_cert_vol)
--- a/cookbooks/concourse-ci/version
+++ b/cookbooks/concourse-ci/version
@@ -1 +1 @@
1-0.2.1
1+0.2.2
Show on old repository browser