daddy 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a219b53e199fbb5c3461d7311c2bc12c3eefb7
-  data.tar.gz: 227e0a98edf7913f363374ccdf287f1eada8b7a1
+  metadata.gz: 3a5cca7d6764d60692724975965fec3f20c9b445
+  data.tar.gz: 1a275d8a6663a7f97c3509f428d413a4b93c90c1
 SHA512:
-  metadata.gz: ae8e32c0a43a35622347f4b63602a50aede0c2a87b5df863d0491ce0fa43e6a67936b3a4c00e17cd308f88a96335a93343d05f98054e4fd4c8c7ba3380db4757
-  data.tar.gz: 8592d9c232dcfd71812c578e20218ad1c0a293e1f75612a40a3288c9aaaa7c1a77c3be2b115d7cc8ff63ab7752870d6610c539f94762d2679e887d6a0410fffa
+  metadata.gz: d44db4037303591c32446ab4854841e2703637afa90c768755e1ecce8f39ced9f1bcf50c72d78a546dc4c521fedbe49373a3d5eeabd69e8469987361f9401f46
+  data.tar.gz: b69f97324591275f7fbdbd6555806b7b50153df5f6cd8b8717ea08f5a56065861c457043bca89dabff9f880c3ac209b5a96403be96cdb0081ae3a94fe7ba88e9

data/itamae/cookbooks/nginx/install.rb

@@ -0,0 +1,29 @@
+require 'daddy/itamae'
+
+template '/etc/yum.repos.d/nginx.repo' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+end
+
+package 'nginx' do
+  user 'root'
+end
+
+execute 'mv -f /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf.org' do
+  user 'root'
+  not_if 'test -e /etc/nginx/conf.d/default.conf.org'
+end
+
+template '/etc/nginx/conf.d/default.conf' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+end
+
+service 'nginx' do
+  user 'root'
+  action :enable
+end

data/itamae/locale/en.yml

@@ -10,4 +10,3 @@ en:
           use public key below.
           
           %{public_key}
-          

data/itamae/locale/ja.yml

@@ -10,4 +10,3 @@ ja:
           下記公開鍵を設定します。
           
           %{public_key}
-          

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

@@ -0,0 +1,5 @@
+[nginx]
+name=nginx repo
+baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
+gpgcheck=0
+enabled=1

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.13'
+  VERSION = '0.5.14'
 end

data/lib/tasks/dad.rake

@@ -1,4 +1,4 @@
-require 'rake'
+require_relative 'task_helper'
 
 task :dad do
   `rake -aT`.force_encoding('UTF-8').split("\n").each do |line|

data/lib/tasks/jenkins/nginx.conf.erb

@@ -1,3 +1,5 @@
+# this file is auto-generated by daddy-<%= daddy_version %>
+
 upstream jenkins {
   server localhost:8080;
 }

data/lib/tasks/locale/en.yml

@@ -4,4 +4,6 @@ en:
   jenkins:
     install: install Jenkins
     plugins:
-      install: install Jenkins plugins
+      install: install Jenkins plugins
+  nginx:
+    install: install Nginx

data/lib/tasks/locale/ja.yml

@@ -4,4 +4,6 @@ ja:
   jenkins:
     install: Jenkinsをインストールします
     plugins:
-      install: Jenkinsプラグインをインストールします
+      install: Jenkinsプラグインをインストールします
+  nginx:
+    install: Nginxをインストールします。

data/lib/tasks/nginx.rake

@@ -3,34 +3,9 @@ require_relative 'task_helper'
 namespace :dad do
   namespace :nginx do
 
-    desc 'Nginxをインストールします。'
+    desc I18n.t('nginx.install')
     task :install do
-      repo = File.join(File.dirname(__FILE__), 'nginx', 'nginx.repo')
-      run "sudo cp -f #{repo} /etc/yum.repos.d/"
-
-      options = []
-      options << '-y'
-      options << '-q' if quiet?
-      run "sudo yum #{options.join(' ')} install nginx"
-
-      empty_conf = render File.join(File.dirname(__FILE__), 'nginx', 'empty.conf.erb'),
-          :to => 'tmp/daddy/nginx/emtpy.conf'
-
-      default_config_files = [
-        '/etc/nginx/conf.d/default.conf',
-        '/etc/nginx/conf.d/example_ssl.conf'
-      ]
-      default_config_files.each do |conf|
-        if File.exist?(conf)
-          run "sudo mv #{conf} #{conf}.org" unless File.exist?("#{conf}.org")
-          run "sudo cp -f #{empty_conf.path} #{conf}"
-        end
-      end
-
-      nginx_conf = render File.join(File.dirname(__FILE__), 'nginx', 'nginx.conf.erb'),
-          :to => 'tmp/daddy/nginx/nginx.conf'
-      run "sudo cp -f #{nginx_conf.path} /etc/nginx/conf.d/nginx.conf",
-          "sudo mkdir -p /etc/nginx/conf.d/servers"
+      run_itamae 'nginx/install'
     end
 
     desc 'Nginxにアプリの設定ファイルをインストールします。'

data/lib/tasks/task_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path('../../daddy/version', __FILE__)
 
 require 'i18n'
 I18n.load_path += Dir.glob(File.expand_path('../../tasks/locale/*.yml', __FILE__))
+I18n.locale = ENV['LANG'][0..1] if ENV['LANG']
 
 def self.daddy_version
   Daddy::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -257,6 +257,7 @@ files:
 - itamae/cookbooks/mysql/mysql_secure_installation.sh
 - itamae/cookbooks/netdata/install.rb
 - itamae/cookbooks/netdata/netdata-installer.sh
+- itamae/cookbooks/nginx/install.rb
 - itamae/cookbooks/phantomjs/install.rb
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
@@ -265,8 +266,10 @@ files:
 - 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/nginx/conf.d/default.conf.erb
 - itamae/templates/etc/sysconfig/jenkins.erb
 - itamae/templates/etc/yum.repos.d/docker.repo.erb
+- itamae/templates/etc/yum.repos.d/nginx.repo.erb
 - lib/active_support/cache/null_store.rb
 - lib/capistrano/daddy.rb
 - lib/capistrano/tasks/update_linked_files.rake
@@ -346,9 +349,6 @@ files:
 - lib/tasks/netdata.rake
 - lib/tasks/nginx.rake
 - lib/tasks/nginx/app.conf.erb
-- lib/tasks/nginx/empty.conf.erb
-- lib/tasks/nginx/nginx.conf.erb
-- lib/tasks/nginx/nginx.repo
 - lib/tasks/phantomjs.rake
 - lib/tasks/publish.rake
 - lib/tasks/redis.rake

data/lib/tasks/nginx/empty.conf.erb

@@ -1 +0,0 @@
-# this file is emptified by daddy-<%= daddy_version %> at <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>.

data/lib/tasks/nginx/nginx.repo

@@ -1,5 +0,0 @@
-[nginx]
-name=nginx repo
-baseurl=http://nginx.org/packages/centos/6/$basearch/
-gpgcheck=0
-enabled=1