From be5fd1d716baed2d6fdeec5e0368d16910bec647 Mon Sep 17 00:00:00 2001 From: whitestar Date: Sat, 11 Feb 2017 11:45:44 +0900 Subject: [PATCH] http by default. --- roles/jenkins.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/jenkins.rb b/roles/jenkins.rb index b15334a..c4b93a5 100644 --- a/roles/jenkins.rb +++ b/roles/jenkins.rb @@ -2,7 +2,7 @@ name 'jenkins' description 'Jenkins' run_list( - 'recipe[ssl_cert::server_key_pairs]', + #'recipe[ssl_cert::server_key_pairs]', 'role[docker]', 'recipe[jenkins-grid::docker-compose]', ) @@ -15,7 +15,7 @@ jenkins_cn = 'jenkins.io.example.com' override_attributes( 'jenkins-grid' => { - 'with_ssl_cert_cookbook' => true, + #'with_ssl_cert_cookbook' => true, 'ssl_cert' => { 'common_name' => jenkins_cn, }, @@ -27,17 +27,17 @@ override_attributes( 'jenkins' => { 'restart' => 'always', 'image' => 'jenkins:2.19.4', - 'expose' => [ - '8083', # for https - ], + #'expose' => [ + # '8083', # for https + #], 'ports' => [ - #'8080:8080', - '8083:8083', + '8080:8080', + #'8083:8083', '50000:50000', ], 'environment' => { 'JENKINS_OPTS' => [ - '--httpPort=-1 --httpsPort=8083', + #'--httpPort=-1 --httpsPort=8083', # These options will be set by the jenkins-grid::docker-compose recipe automatically. #'--httpsCertificate=/var/lib/jenkins/server.crt', #'--httpsPrivateKey=/var/lib/jenkins/server.key', -- 2.11.0