daddy 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db70066d2a9e10ed814aaae0ce58e5138584bf03
-  data.tar.gz: 0f213755b5c314da4411776e90ebbb9d4401b378
+  metadata.gz: 6308ad7d7552c30d5902d7b5ae50e68b94a6ef9e
+  data.tar.gz: 2676b801407bbaa36218ff66eefe66c1b96a0231
 SHA512:
-  metadata.gz: 68f91cc8832c19adb4422bed1a300297189487f5a9e0421717b311ff1501466a91943e739d5d3b611ed8a4b7d0e5572d56adaca62cb3b5b77549ec7de0248836
-  data.tar.gz: 7dd6fa6711ff3615bfb02d2b645570dd9fe4a51f62ac0b64db9c9951dfcd810c42c7df2eb176b62dbfb59a7c009872bb19c6d1ef8408ac515cd152d49666ab33
+  metadata.gz: 930548cd6b99fa4a6a13a4326cadd7b3d2497dff2342285b89fc12419d445c1a96bdd9e44fd18ee45aab4c3e511e2fe07db1c7ee80afb6771828f68ca3588fab
+  data.tar.gz: 4c1ba131807d6b44453b4ce054dd6244087bf3b27f10a487b785b6b808e7db9e394e98cb4b737875881d42eff4ec42f9afdd1df1310bcea464d32d5bcdd75e72

data/itamae/cookbooks/jenkins/install.rb

@@ -13,7 +13,7 @@ when /rhel-7\.(.*?)/
     user 'root'
   end
 else
-  raise "サポートしていないOSバージョンです。#{@os_version}"
+  raise I18n.t('itamae.errors.unsupported_os_version', :os_version => @os_version)
 end
 
 execute 'rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key' do
@@ -45,10 +45,7 @@ service 'jenkins' do
   action [:enable, :start]
 end
 
-directory 'tmp'
-
 execute "wait until jenkins starts" do
-  cwd 'tmp'
   command <<-EOF
     wget --retry-connrefused -t 10 #{ENV['DAD_JENKINS_URL']} ||
     wget -t 10 #{ENV['DAD_JENKINS_URL']} ||
@@ -56,37 +53,51 @@ execute "wait until jenkins starts" do
   EOF
 end
 
-execute 'wget jenkins-cli.jar' do
-  cwd 'tmp'
-  command "wget #{ENV['DAD_JENKINS_URL']}/jnlpJars/jenkins-cli.jar"
-  not_if 'test -e jenkins-cli.jar'
+directory '/var/lib/jenkins/.ssh' do
+  user 'root'
+  owner 'jenkins'
+  group 'jenkins'
+  mode '700'
+end
+  
+execute "ssh-keygen -f id_rsa -q -N ''" do
+  user 'jenkins'
+  cwd '/var/lib/jenkins/.ssh'
+  not_if 'test -e id_rsa'
 end
 
-directory '/var/lib/jenkins/plugins' do
+file '/var/lib/jenkins/.ssh/authorized_keys' do
   user 'root'
-  group 'jenkins'
-  owner 'jenkins'
 end
 
-@plugins = [
-  {:name => 'ansicolor', :version => nil},
-  {:name => 'build-pipeline-plugin', :version => nil},
-  {:name => 'git', :version => nil},
-  {:name => 'git-client', :version => nil},
-  {:name => 'rake', :version => nil},
-  {:name => 'rubyMetrics', :version => nil},
-  {:name => 'htmlpublisher', :version => nil},
-  {:name => 'reverse-proxy-auth-plugin', :version => nil},
-  {:name => 'thinBackup', :version => nil}
-]
-@plugins.each do |plugin|
-  execute "/var/lib/jenkins/plugins/#{plugin[:name]}" do
-    cwd 'tmp'
-    command "java -jar jenkins-cli.jar -s #{ENV['DAD_JENKINS_URL']} install-plugin #{plugin[:name]}"
+%w{ authorized_keys id_rsa id_rsa.pub }.each do |name|
+  file name do
+    cwd '/var/lib/jenkins/.ssh'
+    user 'root'
+    owner 'jenkins'
+    group 'jenkins'
+    mode '600'
   end
 end
 
-execute 'restart jenkins' do
-  cwd 'tmp'
-  command "java -jar jenkins-cli.jar -s #{ENV['DAD_JENKINS_URL']} safe-restart"
+execute 'add public key' do
+  user 'root'
+  cwd '/var/lib/jenkins/.ssh'
+  command 'cat id_rsa.pub >> authorized_keys'
+  not_if "cat authorized_keys | grep \"`cat id_rsa.pub`\""
+end
+
+execute '/etc/init.d/jenkins restart' do
+  user 'root'
+end
+
+local_ruby_block 'post install message' do
+  block do
+    message = I18n.t('itamae.messages.jenkins.after_install',
+        :jenkins_url => ENV['DAD_JENKINS_URL'],
+        :public_key => `sudo cat /var/lib/jenkins/.ssh/id_rsa.pub`)
+    message.split("\n").each do |line|
+      Itamae.logger.info line
+    end
+  end
 end

data/itamae/cookbooks/jenkins/plugins/install.rb

@@ -0,0 +1,42 @@
+require 'daddy/itamae'
+
+ENV['DAD_JENKINS_URL'] ||= 'http://localhost:8080'
+
+execute 'wget jenkins-cli.jar' do
+  cwd '/tmp'
+  command "wget #{ENV['DAD_JENKINS_URL']}/jnlpJars/jenkins-cli.jar"
+  not_if 'test -e jenkins-cli.jar'
+end
+
+directory '/var/lib/jenkins/plugins' do
+  user 'root'
+  group 'jenkins'
+  owner 'jenkins'
+end
+
+@plugins = [
+  {:name => 'ansicolor', :version => nil},
+  {:name => 'build-pipeline-plugin', :version => nil},
+  {:name => 'git', :version => nil},
+  {:name => 'git-client', :version => nil},
+  {:name => 'rake', :version => nil},
+  {:name => 'rubyMetrics', :version => nil},
+  {:name => 'htmlpublisher', :version => nil},
+  {:name => 'reverse-proxy-auth-plugin', :version => nil},
+  {:name => 'thinBackup', :version => nil}
+]
+@plugins.each do |plugin|
+  options = "-s #{ENV['DAD_JENKINS_URL']} -i /var/lib/jenkins/.ssh/id_rsa"
+  execute "/var/lib/jenkins/plugins/#{plugin[:name]}" do
+    cwd '/tmp'
+    user 'jenkins'
+    command "java -jar jenkins-cli.jar #{options} install-plugin #{plugin[:name]}"
+    not_if "java -jar jenkins-cli.jar #{options} list-plugins | grep #{plugin[:name]}"
+  end
+end
+
+execute 'restart jenkins' do
+  cwd '/tmp'
+  user 'jenkins'
+  command "java -jar jenkins-cli.jar -s #{ENV['DAD_JENKINS_URL']} -i /var/lib/jenkins/.ssh/id_rsa safe-restart"
+end

data/itamae/cookbooks/netdata/install.rb

@@ -0,0 +1,24 @@
+require 'daddy/itamae'
+
+%w{ zlib-devel gcc make git autoconf autogen automake pkgconfig }.each do |name|
+  package name do
+    user 'root'
+  end
+end
+
+directory '/opt/src' do
+  user 'root'
+  owner ENV['USER']
+  group ENV['USER']
+end
+
+git 'netdata' do
+  destination '/opt/src/netdata'
+  repository 'https://github.com/firehol/netdata.git'
+end
+
+execute 'netdata-installer.sh' do
+  user 'root'
+  cwd '/tmp/netdata'
+  command "bash #{File.join(File.dirname(__FILE__), 'netdata-installer.sh')}"
+end

data/itamae/cookbooks/netdata/netdata-installer.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+expect -c "
+  spawn ./netdata-installer.sh --install /opt
+  expect \"Press Control-C and run the same command with --help for help.\"
+  send \"\n\"
+  interact
+"

data/itamae/locale/en.yml

@@ -1,4 +1,13 @@
 en:
   itamae:
     errors:
-      unsupported_os_version: unsupported os version. %{os_version}
+      unsupported_os_version: unsupported os version. %{os_version}
+    messages:
+      jenkins:
+        after_install: |
+          installation completed.
+          access %{jenkins_url} and add first user.
+          use public key below.
+          
+          %{public_key}
+          

data/itamae/locale/ja.yml

@@ -1,4 +1,13 @@
 ja:
   itamae:
     errors:
-      unsupported_os_version: サポートしていないOSバージョンです。%{os_version}
+      unsupported_os_version: サポートしていないOSバージョンです。%{os_version}
+    messages:
+      jenkins:
+        after_install: |
+          インストールが完了しました。
+          %{jenkins_url} にアクセスし、最初のユーザを登録します。
+          下記公開鍵を設定します。
+          
+          %{public_key}
+          

data/itamae/templates/etc/sysconfig/jenkins.erb

@@ -44,8 +44,9 @@ JENKINS_USER="jenkins"
 #
 # Options to pass to java when running Jenkins.
 #
-JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true ${JENKINS_JAVA_OPTIONS}"
+JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
 JENKINS_JAVA_OPTIONS="-Dhudson.model.DirectoryBrowserSupport.CSP=\"sandbox allow-same-origin allow-scripts; default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline';\" ${JENKINS_JAVA_OPTIONS}"
+JENKINS_JAVA_OPTIONS="-Dhudson.diyChunking=false ${JENKINS_JAVA_OPTIONS}"
 
 ## Type:        integer(0:65535)
 ## Default:     8080
@@ -101,24 +102,6 @@ JENKINS_HTTPS_KEYSTORE_PASSWORD=""
 #
 JENKINS_HTTPS_LISTEN_ADDRESS=""
 
-## Type:        integer(0:65535)
-## Default:     8009
-## ServiceRestart: jenkins
-#
-# Ajp13 Port Jenkins is listening on.
-# Set to -1 to disable
-#
-JENKINS_AJP_PORT="-1"
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# IP address Jenkins listens on for Ajp13 requests.
-# Default is all interfaces (0.0.0.0).
-#
-JENKINS_AJP_LISTEN_ADDRESS=""
-
 ## Type:        integer(1:9)
 ## Default:     5
 ## ServiceRestart: jenkins

data/lib/daddy/itamae.rb

@@ -36,7 +36,7 @@ end
 
 require 'i18n'
 I18n.available_locales = [:en, :ja]
-I18n.default_locale = ENV['LANG'].start_with?('ja_') ? :ja : en
+I18n.default_locale = ENV['LANG'].start_with?('ja_') ? :ja : :en
 I18n.load_path += Dir.glob(File.expand_path('../../../itamae/locale/*.yml', __FILE__))
 
 Dir[File.join(File.dirname(__FILE__), 'itamae', '*.rb')].each do |f|

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.10'
+  VERSION = '0.5.11'
 end

data/lib/tasks/jenkins.rake

@@ -3,13 +3,13 @@ require_relative 'task_helper'
 namespace :dad do
   namespace :jenkins do
 
-    desc 'Jenkinsをインストールします。'
+    desc I18n.t('jenkins.install')
     task :install do
       run_itamae 'jenkins/install'
     end
 
     namespace :nginx do
-      desc 'Nginxの設定を行います。'
+      desc 'Nginxの設定を行います'
       task :config do
         @server_name = ask('server_name', :required => true)
         @ssl_certificate = ask('ssl_certificate')
@@ -23,5 +23,12 @@ namespace :dad do
       end
     end
 
+    namespace :plugins do
+      desc I18n.t('jenkins.plugins.install')
+      task :install do
+        run_itamae 'jenkins/plugins/install'
+      end
+    end
+
   end
 end

data/lib/tasks/locale/en.yml

@@ -1,3 +1,7 @@
 en:
   god:
-    install: install God
+    install: install God
+  jenkins:
+    install: install Jenkins
+    plugins:
+      install: install Jenkins plugins

data/lib/tasks/locale/ja.yml

@@ -1,3 +1,7 @@
-en:
+ja:
   god:
-    install: God をインストールします
+    install: God をインストールします
+  jenkins:
+    install: Jenkinsをインストールします
+    plugins:
+      install: Jenkinsプラグインをインストールします

data/lib/tasks/netdata.rake

@@ -0,0 +1,12 @@
+require_relative 'task_helper'
+
+namespace :dad do
+  namespace :netdata do
+
+    desc 'netdataをインストールします。'
+    task :install do
+      run_itamae 'netdata/install'
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: closer
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +98,16 @@ dependencies:
   name: itamae
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Daddy helps me build web applications since daddy knows some good practices.
 email: ichylinux@gmail.com
 executables:
@@ -251,8 +251,11 @@ files:
 - itamae/cookbooks/docker/registry/install.rb
 - itamae/cookbooks/god/install.rb
 - itamae/cookbooks/jenkins/install.rb
+- itamae/cookbooks/jenkins/plugins/install.rb
 - itamae/cookbooks/mysql/install.rb
 - itamae/cookbooks/mysql/mysql_secure_installation.sh
+- itamae/cookbooks/netdata/install.rb
+- itamae/cookbooks/netdata/netdata-installer.sh
 - itamae/cookbooks/phantomjs/install.rb
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
@@ -334,6 +337,7 @@ files:
 - lib/tasks/locale/en.yml
 - lib/tasks/locale/ja.yml
 - lib/tasks/mysql.rake
+- lib/tasks/netdata.rake
 - lib/tasks/nginx.rake
 - lib/tasks/nginx/app.conf.erb
 - lib/tasks/nginx/empty.conf.erb
@@ -382,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: My rails dad