daddy 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bfd6eb1b3e05eaddbac647dac11311f652495de
-  data.tar.gz: efc95037653026b348047cb090414870f0733278
+  metadata.gz: 27d628722adf1bb28a9ba89b299a5cab706911dc
+  data.tar.gz: b83187399fe2fe5362564726805a0db8fe526dc0
 SHA512:
-  metadata.gz: 8e1103c76f2e59c515cee78e05d15cc0793bd583cdc7feb8ed8d65ff7549a85555e0aa15361dbc4d886823c59446f20c087c27bc7a43c78df67c25ed4f86748d
-  data.tar.gz: f1eb1abc16ebde0e65a694ec3ff2ae4678e299082dc474042750778138f720a2223c95e583fbfe2071b35a3b33944fef88ecefdf2b008580193ee5ba5af1d27a
+  metadata.gz: f5ea07ef2b29a1491ed479acab1b3a59d79fe7ea2bb3f6d4915ffe963dbb84cc9cf9a7f2a9a55576510ba87552caa97bc1ddfc3c51cb94f56ac83add7f1964f6
+  data.tar.gz: 9b65fce10df7d28cb9a3ec3d0af3aa90b04a093c3f77753314be93371c072aaa513713ee9377c5985df73a94ead6be9c3cbdadefba26a2972c89200feb947648

data/itamae/cookbooks/god/install.rb

@@ -0,0 +1,43 @@
+require 'daddy/itamae'
+
+execute '/etc/init.d/god stop' do
+  user 'root'
+  only_if '-e /var/run/god.pid'
+end
+
+gem_package 'god' do
+  user 'root'
+end
+
+template '/etc/init.d/god' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '755'
+end
+
+directory '/etc/god' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '755'
+end
+
+template '/etc/god/master.conf' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+end
+
+template '/etc/logrotate.d/god' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+end
+
+service 'god' do
+  user 'root'
+  action [:enable, :start]
+end

data/itamae/cookbooks/jenkins/install.rb

@@ -16,13 +16,16 @@ else
   raise "サポートしていないOSバージョンです。#{@os_version}"
 end
 
-execute '/etc/yum.repos.d/jenkins.repo' do
+http_request '/etc/yum.repos.d/jenkins.repo' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+  url 'http://pkg.jenkins-ci.org/redhat/jenkins.repo'
+end
+
+execute 'rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key' do
   user 'root'
-  command <<-EOF
-    wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
-    rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
-  EOF
-  not_if 'test -e /etc/yum.repos.d/jenkins.repo'
 end
 
 package 'jenkins' do
@@ -41,20 +44,29 @@ service 'jenkins' do
   action [:enable, :start]
 end
 
-directory '/var/lib/jenkins/plugins' do
-  user 'root'
-  group 'jenkins'
-  owner 'jenkins'
-end
-
 directory 'tmp'
 
-execute 'jenkins-cli.jar' do
+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']} ||
+    echo $?    
+  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'
 end
 
+directory '/var/lib/jenkins/plugins' do
+  user 'root'
+  group 'jenkins'
+  owner 'jenkins'
+end
+
 @plugins = [
   {:name => 'build-pipeline-plugin', :version => nil},
   {:name => 'git', :version => nil},

data/itamae/templates/etc/god/master.conf.erb

@@ -0,0 +1 @@
+God.load '/etc/god/*.god'

data/itamae/templates/etc/logrotate.d/god.erb

@@ -0,0 +1,8 @@
+/var/log/god.log {
+  daily
+  missingok
+  ifempty
+  rotate 31
+  compress
+  copytruncate
+}

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/tasks/docker.rake

@@ -3,6 +3,16 @@ require_relative 'task_helper'
 namespace :dad do
   namespace :docker do
 
+    desc 'delete stopped containers and untagged images'
+    task :clean do
+      unless `docker ps -qa --filter status=exited`.empty?
+        run 'docker rm `docker ps -qa --filter status=exited`'
+      end
+      unless `docker images -q --filter "dangling=true"`.empty?
+        run 'docker rmi `docker images -q --filter "dangling=true"`'
+      end
+    end
+
     desc 'install Docker'
     task :install do
       run_itamae 'docker/install'

data/lib/tasks/god.rake

@@ -3,10 +3,9 @@ require 'rake'
 namespace :dad do
   namespace :god do
 
-    desc "Godをインストールします。"
+    desc I18n.t('god.install')
     task :install do
-      script = File.join(File.dirname(__FILE__), 'god', 'install.sh')
-      system("bash -x #{script} #{rails_env} #{rails_root}")
+      run_itamae 'god/install'
     end
 
   end

data/lib/tasks/locale/en.yml

@@ -0,0 +1,3 @@
+en:
+  god:
+    install: install God

data/lib/tasks/locale/ja.yml

@@ -0,0 +1,3 @@
+en:
+  god:
+    install: God をインストールします

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: itamae
   requirement: !ruby/object:Gem::Requirement
@@ -235,10 +249,14 @@ files:
 - bin/dad
 - itamae/cookbooks/docker/install.rb
 - itamae/cookbooks/docker/registry/install.rb
+- itamae/cookbooks/god/install.rb
 - itamae/cookbooks/jenkins/install.rb
 - itamae/cookbooks/mysql/install.rb
 - itamae/cookbooks/mysql/mysql_secure_installation.sh
 - itamae/cookbooks/phantomjs/install.rb
+- itamae/templates/etc/god/master.conf.erb
+- itamae/templates/etc/init.d/god.erb
+- itamae/templates/etc/logrotate.d/god.erb
 - itamae/templates/etc/my.cnf.d/daddy.cnf.erb
 - itamae/templates/etc/my.cnf.erb
 - itamae/templates/etc/sysconfig/jenkins.erb
@@ -303,10 +321,6 @@ files:
 - lib/tasks/generate/controller.rake
 - lib/tasks/generate/view.rake
 - lib/tasks/god.rake
-- lib/tasks/god/god
-- lib/tasks/god/install.sh
-- lib/tasks/god/logrotate
-- lib/tasks/god/master.conf
 - lib/tasks/jenkins.rake
 - lib/tasks/jenkins/nginx.conf.erb
 - lib/tasks/kibana.rake
@@ -314,6 +328,8 @@ files:
 - lib/tasks/kibana/configure.sh
 - lib/tasks/kibana/install.sh
 - lib/tasks/kibana/nginx.conf.erb
+- lib/tasks/locale/en.yml
+- lib/tasks/locale/ja.yml
 - lib/tasks/mysql.rake
 - lib/tasks/nginx.rake
 - lib/tasks/nginx/app.conf.erb

data/lib/tasks/god/install.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-SCRIPT_BASE=`dirname $0`
-export RAILS_ENV=$1
-export RAILS_ROOT=$2
-
-# stop god
-  if [ -e /var/run/god.pid ]; then
-    sudo /etc/init.d/god stop
-  fi
-
-# install
-  sudo gem install god --no-ri --no-rdoc
-
-# init.d
-  sudo cp -f ${SCRIPT_BASE}/god /etc/init.d/god
-  sudo chown root:root /etc/init.d/god
-  sudo chmod 755 /etc/init.d/god
-
-# master.conf
-  sudo mkdir -p /etc/god
-  sudo cp -f ${SCRIPT_BASE}/master.conf /etc/god/master.conf
-  sudo chown root:root /etc/god/master.conf
-  sudo chmod 644 /etc/god/master.conf
-
-# logrotate
-  sudo cp -f ${SCRIPT_BASE}/logrotate /etc/logrotate.d/god
-  sudo chown root:root /etc/logrotate.d/god
-  sudo chmod 644 /etc/logrotate.d/god
-
-# service
-  sudo /sbin/chkconfig god on
-
-# start
-  sudo /etc/init.d/god start

data/lib/tasks/god/logrotate

@@ -1,11 +0,0 @@
-/var/log/god.log {
-  daily
-  missingok
-  rotate 30
-  compress
-  delaycompress
-  sharedscripts
-  postrotate
-    /etc/init.d/god restart
-  endscript
-}

data/lib/tasks/god/master.conf

@@ -1,3 +0,0 @@
-Dir.glob("/etc/god/*.god").each do |app_config|
-  load app_config
-end