refactoring.

diff --git a/cookbooks/jenkins-grid/CHANGELOG.md b/cookbooks/jenkins-grid/CHANGELOG.md
index 525043e..0c780b2 100644 (file)
--- a/cookbooks/jenkins-grid/CHANGELOG.md
+++ b/cookbooks/jenkins-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # jenkins-grid CHANGELOG
 
+0.2.5
+-----
+- refactoring.
+
 0.2.4
 -----
 - includes the `ssl_cert::server_key_pairs` recipe automatically.

diff --git a/cookbooks/jenkins-grid/README.md b/cookbooks/jenkins-grid/README.md
index cd91c1c..446adfa 100644 (file)
--- a/cookbooks/jenkins-grid/README.md
+++ b/cookbooks/jenkins-grid/README.md
@@ -20,7 +20,10 @@ This cookbook sets up a Jenkins service.
 ## Requirements
 
 ### platforms
-- none.
+
+- Debian >= 9.0
+- Ubuntu >= 14.04
+- CentOS,RHEL >= 7.3
 
 ### packages
 - none.

diff --git a/cookbooks/jenkins-grid/attributes/default.rb b/cookbooks/jenkins-grid/attributes/default.rb
index 278c648..8c7ab49 100644 (file)
--- a/cookbooks/jenkins-grid/attributes/default.rb
+++ b/cookbooks/jenkins-grid/attributes/default.rb
@@ -29,7 +29,7 @@ default['jenkins-grid']['log.properties'] = {
   'java.util.logging.ConsoleHandler.level' => 'FINEST',
 }
 default['jenkins-grid']['docker-compose']['app_dir'] = "#{node['docker-grid']['compose']['app_dir']}/jenkins"
-default['jenkins-grid']['docker-compose']['jenkins_home'] = {
+force_override['jenkins-grid']['docker-compose']['jenkins_home'] = {
   'path' => '/var/lib/jenkins_home',
   'owner' => 1000,
 }

diff --git a/cookbooks/jenkins-grid/metadata.rb b/cookbooks/jenkins-grid/metadata.rb
index bb65163..e6e39e8 100644 (file)
--- a/cookbooks/jenkins-grid/metadata.rb
+++ b/cookbooks/jenkins-grid/metadata.rb
@@ -10,6 +10,8 @@ source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
 
 chef_version     '>= 12'
+
+supports 'debian', '>= 9.0'
 supports 'ubuntu', '>= 14.04'
 %w(centos redhat).each do |os|
   supports os, '>= 7.3'

diff --git a/cookbooks/jenkins-grid/recipes/docker-compose.rb b/cookbooks/jenkins-grid/recipes/docker-compose.rb
index df2bd1b..aef75e2 100644 (file)
--- a/cookbooks/jenkins-grid/recipes/docker-compose.rb
+++ b/cookbooks/jenkins-grid/recipes/docker-compose.rb
@@ -82,8 +82,10 @@ if node['jenkins-grid']['with_ssl_cert_cookbook']
       chmod 600 #{certs_dir}/server.key
     EOH
     sensitive true
-    action :nothing
-    subscribes :run, "file[#{key_path}]"
+    action :run
+    not_if "cmp #{key_path} #{certs_dir}/server.key"
+    #action :nothing
+    #subscribes :run, "file[#{key_path}]"
   end
 
   vols.push("#{server_cert_path(cn)}:/var/lib/jenkins/server.crt:ro")

diff --git a/cookbooks/jenkins-grid/version b/cookbooks/jenkins-grid/version
index abd4105..3a4036f 100644 (file)
--- a/cookbooks/jenkins-grid/version
+++ b/cookbooks/jenkins-grid/version
@@ -1 +1 @@
-0.2.4
+0.2.5