daddy 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a08fdea3a2abe66428f4c4d223a06a9ce0cf722
-  data.tar.gz: 0e9200d33c27789a2154e8a375aaf70eae8cfa05
+  metadata.gz: ad909474011e58e85079da60b460e1c2bd192d0d
+  data.tar.gz: c5847a1dbf71152547b7d4fc132395736c508a14
 SHA512:
-  metadata.gz: 6dbf623ff1350f5426f98fdf7dca336bef32c78a577cb6a3efe8b4be1ec4667c4193c63401562f0ebce31a96108d105444681948babdade0b07769133e003b9e
-  data.tar.gz: f3eac29f1508edc07218d102c26ce17652f067b56b46ca62900f0e29181fc5c9557a8b71b1f14668217e16c483ecd603151ccc6fa5e2b38ca651707f8ba22e25
+  metadata.gz: 5ba9fe71c13cf7d486ba283acf14d3c2f847d65e059f065c3f94a282692c8d79f2ba119278606fe4017cee8cab4bde6e36ce94e0c95e2baa9a10d716d4379228
+  data.tar.gz: ece215f7fd5e73da83667e5aaa266c0e0e88f3f2571ff238f4f32554e328d7826e2faf0eb418d1a02dc6d578df5742b95d87062698c187b7d143f73ccf0f2b0a

data/bin/dad

@@ -12,7 +12,7 @@ when 'new'
   APP_NAME = ARGV[1]
 
   [
-    "sudo gem install rails -v #{RAILS_VERSION} --no-ri --no-rdoc",
+    "sudo gem install rails -v #{RAILS_VERSION} --no-document",
     "rails _#{RAILS_VERSION}_ new #{APP_NAME} -d mysql --skip-bundle",
   ].each do |command|
     puts command
@@ -26,6 +26,7 @@ when 'new'
 
   [
     "bundle install",
+    "bundle exec rake dad:mysql:install",
     "bundle exec rake dad:install",
     "bundle exec rake dad:db:config",
     "bundle exec rake dad:db:create",

data/itamae/cookbooks/docker/install.rb

@@ -0,0 +1,41 @@
+require 'daddy/itamae'
+
+case os_version
+when /rhel-6\.(.*?)/
+  package 'epel-release' do
+    user 'root'
+  end
+
+  package 'docker-io' do
+    user 'root'
+  end
+
+when /rhel-7\.(.*?)/
+  template '/etc/yum.repos.d/docker.repo' do
+    user 'root'
+    owner 'root'
+    group 'root'
+    mode '644'
+  end
+  
+  package 'docker-engine' do
+    user 'root'
+  end
+
+else
+  raise "unsupported operating system: #{os_version}"
+end
+
+group 'docker' do
+  user 'root'
+end
+
+execute "usermod -aG docker #{ENV['USER']}" do
+  user 'root'
+  not_if "groups #{ENV['USER']} | grep -E \"\sdocker\""
+end
+
+service 'docker' do
+  action [:enable, :start]
+  user 'root'
+end

data/itamae/cookbooks/docker/registry/install.rb

@@ -0,0 +1,3 @@
+require 'daddy/itamae'
+
+execute 'docker pull registry'

data/itamae/cookbooks/mysql/install.rb

@@ -0,0 +1,40 @@
+require 'daddy/itamae'
+
+case os_version
+when /rhel-6\.(.*?)/
+  package 'mysql' do
+    user 'root'
+  end
+
+  package 'mysql-server' do
+    user 'root'
+  end
+
+  service 'mysqld' do
+    user 'root'
+    action [:enable, :start]
+  end
+
+when /rhel-7\.(.*?)/
+  package 'mariadb' do
+    user 'root'
+  end
+
+  package 'mariadb-server' do
+    user 'root'
+  end
+
+  service 'mariadb' do
+    user 'root'
+    action [:enable, :start]
+  end
+
+else
+  raise "サポートしていないOSバージョンです。#{os_version}"
+end
+
+execute 'mysql_secure_installation' do
+  user 'root'
+  command "bash #{File.join(File.dirname(__FILE__), 'mysql_secure_installation.sh')}"
+  only_if "mysql -u root -e 'select 1;' && test $? -eq 0"
+end

data/itamae/cookbooks/mysql/mysql_secure_installation.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+expect -c "
+  set timeout 5
+  spawn mysql_secure_installation
+
+  expect \"Enter current password for root\"
+  send \"\n\"
+
+  expect \"Set root password?\"
+  send \"n\n\"
+
+  expect \"Remove anonymous users?\"
+  send \"y\n\"
+
+  expect \"Disallow root login remotely?\"
+  send \"y\n\"
+
+  expect \"Remove test database and access to it?\"
+  send \"y\n\"
+
+  expect \"Reload privilege tables now?\"
+  send \"y\n\"
+
+  interact
+"

data/itamae/templates/etc/yum.repos.d/docker.repo.erb

@@ -0,0 +1,6 @@
+[dockerrepo]
+name=Docker Repository
+baseurl=https://yum.dockerproject.org/repo/main/centos/$releasever/
+enabled=1
+gpgcheck=1
+gpgkey=https://yum.dockerproject.org/gpg

data/lib/daddy/itamae.rb

@@ -33,3 +33,7 @@ module Itamae
     end
   end
 end
+
+Dir[File.join(File.dirname(__FILE__), 'itamae', '*.rb')].each do |f|
+  require f
+end

data/lib/daddy/itamae/os_version.rb

@@ -0,0 +1,3 @@
+def os_version
+  @_os_version ||= "#{node[:platform_family]}-#{node[:platform_version]}"
+end

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/tasks/db_create.rake

@@ -24,12 +24,13 @@ namespace :dad do
         end
       end
 
+      system("echo 'flush privileges;' >> tmp/create_databases.sql")
       system("echo >> tmp/create_databases.sql")
 
       puts
       puts File.read('tmp/create_databases.sql')
 
-      if ENV['NO_ROOT_PASSWORD']
+      if ENV['DAD_MYSQL_NO_ROOT_PASSWORD']
         fail unless system("mysql -u root < tmp/create_databases.sql")
       else
         fail unless system("mysql -u root -p < tmp/create_databases.sql")

data/lib/tasks/docker.rake

@@ -0,0 +1,20 @@
+require_relative 'task_helper'
+
+namespace :dad do
+  namespace :docker do
+
+    desc 'install Docker'
+    task :install do
+      run_itamae 'docker/install'
+    end
+
+    namespace :registry do
+
+      desc 'install Docker Registry'
+      task :install do
+        run_itamae 'docker/install', 'docker/registry/install'
+      end
+    end
+
+  end
+end

data/lib/tasks/mysql.rake

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

data/lib/tasks/task_helper.rb

@@ -102,12 +102,16 @@ def self.run(*commands)
   end
 end
 
-def self.run_itamae(recipe)
+def self.run_itamae(*recipes)
   options = []
   options << '--ohai'
   options << '--log-level=debug' if ENV['DEBUG']
 
-  recipe = "#{recipe}.rb" unless recipe.end_with?('.rb')
+  recipe_files = []
+  recipes.each do |recipe|
+    recipe = "#{recipe}.rb" unless recipe.end_with?('.rb')
+    recipe_files << File.join(cookbook_dir, recipe)
+  end
 
-  run "bundle exec itamae local #{options.join(' ')} #{File.join(cookbook_dir, recipe)}"
+  run "bundle exec itamae local #{options.join(' ')} #{recipe_files.join(' ')}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -233,9 +233,14 @@ files:
 - app/assets/stylesheets/datepicker.css.scss
 - app/assets/stylesheets/ympicker.css.scss
 - bin/dad
+- itamae/cookbooks/docker/install.rb
+- itamae/cookbooks/docker/registry/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/sysconfig/jenkins.erb
+- itamae/templates/etc/yum.repos.d/docker.repo.erb
 - lib/active_support/cache/null_store.rb
 - lib/capistrano/daddy.rb
 - lib/capistrano/tasks/update_linked_files.rake
@@ -259,6 +264,7 @@ files:
 - lib/daddy/helpers/html_helper.rb
 - lib/daddy/http_client.rb
 - lib/daddy/itamae.rb
+- lib/daddy/itamae/os_version.rb
 - lib/daddy/model.rb
 - lib/daddy/models/crud_extension.rb
 - lib/daddy/models/query_extension.rb
@@ -283,6 +289,7 @@ files:
 - lib/tasks/db_fixtures.rake
 - lib/tasks/db_load.rake
 - lib/tasks/diary.rake
+- lib/tasks/docker.rake
 - lib/tasks/elasticsearch.rake
 - lib/tasks/elasticsearch/elasticsearch.conf.erb
 - lib/tasks/elasticsearch/elasticsearch.yml.erb
@@ -305,6 +312,7 @@ files:
 - lib/tasks/kibana/configure.sh
 - lib/tasks/kibana/install.sh
 - lib/tasks/kibana/nginx.conf.erb
+- lib/tasks/mysql.rake
 - lib/tasks/nginx.rake
 - lib/tasks/nginx/app.conf.erb
 - lib/tasks/nginx/empty.conf.erb