daddy 0.5.32 → 0.5.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1e7094fadb79cb8e63f11b1cf31ae78e3b419c
-  data.tar.gz: d10a84611f3f60d6bb90670018c9933ac4156e17
+  metadata.gz: fc0b0881337726ebc4fe5672bc5a49f255b1bd66
+  data.tar.gz: f04c61ce4022d22f5f3aa751a5c95ae055c41ca6
 SHA512:
-  metadata.gz: bc2e7404057a351ece154bfe878525b60f83db14f9a84ede472c5da091fb412b0d509d112e0fd696bca23620bfe6e1fba853b8734a96ae5f7b3e6d0ab475a075
-  data.tar.gz: 841fac960968c721711503588cf914f025dcd405b8eef2c8724e59194ba1a62d94610e22067cac25dfa8ce59658c4db067cdd33f1c4693c14dd40ebaf02dcda9
+  metadata.gz: 7b40630689e5f5d61e6a637e33da671eaf254edb832fc69ee53c7060a52834f3308f2605a142b98f5c88ac79bbd47f86b4672e50c01d415b190d1490f1224c83
+  data.tar.gz: 6fc8fdfcf3d63b7cc88330f1aa4ed1d7eb78fbcac6f8e615dee4968933afb7047e4194e8a39b9652120a392297b21ace7956922339d89cfe7692b44e7cfe7597

data/itamae/cookbooks/docker/install.rb

@@ -11,17 +11,20 @@ when /rhel-6\.(.*?)/
   end
 
 when /rhel-7\.(.*?)/
-  template '/etc/yum.repos.d/docker.repo' do
+  %w{ yum-utils device-mapper-persistent-data lvm2 }.each do |name|
+    package name do
+      user 'root'
+    end
+  end
+
+  execute 'yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo' do
     user 'root'
-    owner 'root'
-    group 'root'
-    mode '644'
+    not_if 'test -e /etc/yum.repos.d/docker-ce.repo'
   end
   
-  package 'docker-engine' do
+  package 'docker-ce' do
     user 'root'
   end
-
 else
   raise "unsupported operating system: #{os_version}"
 end
@@ -30,8 +33,9 @@ group 'docker' do
   user 'root'
 end
 
-execute "usermod -aG docker #{ENV['USER']}" do
+execute "add user to docker group" do
   user 'root'
+  command "usermod -aG docker #{ENV['USER']}"
   not_if "groups #{ENV['USER']} | grep -E \"\sdocker\""
 end
 
@@ -39,3 +43,12 @@ service 'docker' do
   action [:enable, :start]
   user 'root'
 end
+
+local_ruby_block 'post install message' do
+  block do
+    message = I18n.t('itamae.messages.docker.after_install', :user => ENV['USER'])
+    message.split("\n").map {|line| Itamae.logger.info line }
+  end
+  action :nothing
+  subscribes :run, 'execute[add user to docker group]'
+end

data/itamae/cookbooks/git/install.rb

@@ -0,0 +1,11 @@
+package 'git' do
+  user 'root'
+end
+
+execute 'curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | sudo bash' do
+  not_if 'test -e /etc/yum.repos.d/github_git-lfs.repo'
+end
+
+package 'git-lfs' do
+  user 'root'
+end

data/itamae/cookbooks/jenkins/install.rb

@@ -21,12 +21,11 @@ execute 'rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key' do
   not_if 'test -e /etc/yum.repos.d/jenkins.repo'
 end
 
-http_request '/etc/yum.repos.d/jenkins.repo' do
+template '/etc/yum.repos.d/jenkins.repo' do
   user 'root'
-  owner 'root'
   group 'root'
+  owner 'root'
   mode '644'
-  url 'http://pkg.jenkins-ci.org/redhat/jenkins.repo'
 end
 
 package 'jenkins' do
@@ -37,7 +36,7 @@ template '/etc/sysconfig/jenkins' do
   user 'root'
   group 'root'
   owner 'root'
-  mode '644'
+  mode '600'
 end
 
 service 'jenkins' do
@@ -87,8 +86,10 @@ execute 'add public key' do
   not_if "cat authorized_keys | grep \"`cat id_rsa.pub`\""
 end
 
-execute '/etc/init.d/jenkins restart' do
+service 'jenkins' do
   user 'root'
+  action :nothing
+  subscribes :restart, 'template[/etc/sysconfig/jenkins]'
 end
 
 local_ruby_block 'post install message' do
@@ -96,8 +97,6 @@ local_ruby_block 'post install message' 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
+    message.split("\n").map {|line| Itamae.logger.info line }
   end
 end

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

@@ -17,12 +17,9 @@ 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|

data/itamae/cookbooks/letsencrypt/install.rb

@@ -1,18 +1,11 @@
 require 'daddy/itamae'
 
-%w{ git }.each do |name|
+%w{
+  epel-release
+  certbot
+  python2-certbot-nginx
+}.each do |name|
   package name do
     user 'root'
   end
 end
-
-directory '/opt/letsencrypt' do
-  user 'root'
-  owner ENV['USER']
-  group ENV['USER']
-  mode '755'
-end
-
-git '/opt/letsencrypt/certbot' do
-  repository 'https://github.com/certbot/certbot'
-end

data/itamae/cookbooks/nginx/config/gitbucket.rb

@@ -0,0 +1,9 @@
+require 'daddy/itamae'
+
+template "/etc/nginx/conf.d/servers/gitbucket.conf" do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+  variables :server_name => ENV['SERVER_NAME'], :port => ENV['PORT']
+end

data/itamae/cookbooks/nginx/config/jenkins.rb

@@ -0,0 +1,9 @@
+require 'daddy/itamae'
+
+template "/etc/nginx/conf.d/servers/jenkins.conf" do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+  variables :server_name => ENV['SERVER_NAME']
+end

data/itamae/cookbooks/nginx/install.rb

@@ -1,13 +1,14 @@
 require 'daddy/itamae'
 
 dad_nginx_checksum = File.join(File.dirname(__FILE__), 'sha256sum.txt')
-dad_nginx_version = '1.13.1'
+dad_nginx_version = '1.13.4'
 
 directory 'tmp'
 
 # install destination
 %w{
   /opt/nginx
+  /opt/nginx/cache
   /opt/nginx/shared
   /opt/nginx/shared/logs
 }.each do |name|
@@ -36,7 +37,7 @@ include_recipe 'modules/passenger'
 execute 'build nginx' do
   cwd 'tmp'
   command <<-EOF
-    rm -Rf nginx-#{dad_nginx_version}
+    rm -Rf nginx-#{dad_nginx_version}/
     tar zxf nginx-#{dad_nginx_version}.tar.gz
     cd nginx-#{dad_nginx_version}
     sudo ./configure \

data/itamae/cookbooks/nginx/modules/passenger.rb

@@ -1,4 +1,4 @@
 gem_package 'passenger' do
   user 'root'
-  version '5.1.4'
+  version '5.1.7'
 end

data/itamae/cookbooks/nginx/sha256sum.txt

@@ -1 +1 @@
-a5856c72a6609a4dc68c88a7f3c33b79e6693343b62952e021e043fe347b6776  nginx-1.13.1.tar.gz
+de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba  nginx-1.13.4.tar.gz

data/itamae/cookbooks/sbt/install.rb

@@ -0,0 +1,14 @@
+directory 'tmp'
+
+execute 'download repo definition' do
+  cwd 'tmp'
+  command <<-EOF
+    curl https://bintray.com/sbt/rpm/rpm > bintray-sbt-rpm.repo
+    sudo mv bintray-sbt-rpm.repo /etc/yum.repos.d/
+  EOF
+  not_if 'test -e /etc/yum.repos.d/bintray-sbt-rpm.repo'
+end
+
+package 'sbt' do
+  user 'root'
+end

data/itamae/locale/en.yml

@@ -3,10 +3,14 @@ en:
     errors:
       unsupported_os_version: unsupported os version. %{os_version}
     messages:
+      docker:
+        after_install: |
+          user %{user} is added to group docker.
+          please restart os to reflect the change.
       jenkins:
         after_install: |
           installation completed.
-          access %{jenkins_url} and add first user.
-          use public key below.
+          please access %{jenkins_url} and add first user.
+          use public key below for your git repository.
           
           %{public_key}

data/itamae/locale/ja.yml

@@ -3,10 +3,14 @@ ja:
     errors:
       unsupported_os_version: サポートしていないOSバージョンです。%{os_version}
     messages:
+      docker:
+        after_install: |
+          ユーザ %{user} をグループ docker に追加しました。
+          OSを再起動して変更を反映してください。
       jenkins:
         after_install: |
           インストールが完了しました。
-          %{jenkins_url} にアクセスし、最初のユーザを登録します。
-          下記公開鍵を設定します。
+          %{jenkins_url} にアクセスし、最初のユーザを登録してください。
+          SSH鍵を作成しました。Gitリポジトリに下記公開鍵を設定してください。
           
           %{public_key}

data/itamae/templates/etc/nginx/conf.d/default.conf.erb

@@ -29,6 +29,8 @@ http {
 
   #gzip  on;
 
+  proxy_cache_path /opt/nginx/cache levels=1:2 keys_zone=cache:512m inactive=1d  max_size=60g;
+
   passenger_root <%= `sudo passenger-config about root` %>;
   passenger_instance_registry_dir /var/run/passenger-instreg;
 

data/itamae/templates/etc/nginx/conf.d/servers/gitbucket.conf.erb

@@ -0,0 +1,49 @@
+<%-
+  @letsencrypt = system("sudo test -e /etc/letsencrypt/live/#{@server_name}/fullchain.pem")
+  @selfsigned = system('sudo test -e /etc/pki/tls/certs/localhost.crt')
+  @ssl = @letsencrypt || @selfsigned
+-%>
+upstream gitbucket {
+  server localhost:<%= @port %>;
+}
+
+server {
+  listen 80;
+<%- if @ssl -%>
+  listen 443 ssl;
+<%- end -%>
+  server_name <%= @server_name %>;
+  access_log /opt/nginx/shared/logs/<%= @server_name %>_access.log ltsv;
+
+<%- if @letsencrypt -%>
+  ssl_certificate /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%= @server_name %>/privkey.pem;
+<%- elsif @selfsigned -%>
+  ssl_certificate /etc/pki/tls/certs/localhost.crt;
+  ssl_certificate_key /etc/pki/tls/private/localhost.key;
+<%- end -%>
+
+  location / {
+    proxy_pass              http://localhost:<%= @port %>;
+    proxy_redirect http:// https://;
+    proxy_set_header        Host $host;
+    proxy_set_header        X-Real-IP $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-User $remote_user;
+    proxy_connect_timeout   150;
+    proxy_send_timeout      100;
+    proxy_read_timeout      100;
+    proxy_buffers           4 32k;
+    client_max_body_size    500m; # Big number is we can post big commits.
+    client_body_buffer_size 128k;
+  }
+
+  location /assets/ {
+    proxy_pass              http://localhost:<%= @port %>/assets/;
+    proxy_cache             cache;
+    proxy_cache_key         $host$uri$is_args$args;
+    proxy_cache_valid       200 301 302 1d;
+    expires                 1d;
+  }
+
+}

data/itamae/templates/etc/nginx/conf.d/servers/jenkins.conf.erb

@@ -0,0 +1,37 @@
+<%-
+  @letsencrypt = system("sudo test -e /etc/letsencrypt/live/#{@server_name}/fullchain.pem")
+  @selfsigned = system('sudo test -e /etc/pki/tls/certs/localhost.crt')
+  @ssl = @letsencrypt || @selfsigned
+-%>
+upstream jenkins {
+  server localhost:8080;
+}
+
+server {
+  listen 80;
+<%- if @ssl -%>
+  listen 443 ssl;
+<%- end -%>
+  server_name <%= @server_name %>;
+  access_log /opt/nginx/shared/logs/<%= @server_name %>_access.log ltsv;
+
+<%- if @letsencrypt -%>
+  ssl_certificate /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%= @server_name %>/privkey.pem;
+<%- elsif @selfsigned -%>
+  ssl_certificate /etc/pki/tls/certs/localhost.crt;
+  ssl_certificate_key /etc/pki/tls/private/localhost.key;
+<%- end -%>
+
+  root /var/cache/jenkins/war;
+
+  location / {
+    proxy_pass http://jenkins;
+    proxy_redirect http:// https://;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-User $remote_user;
+  }
+}

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

@@ -0,0 +1,5 @@
+[jenkins]
+name=Jenkins
+baseurl=http://pkg.jenkins.io/redhat
+gpgcheck=1
+enabled=0

data/lib/capistrano/daddy.rb

@@ -1,2 +1,4 @@
 STDOUT.sync = true
 Dir.glob(File.join(File.dirname(__FILE__), 'tasks/*.rake')).each { |r| import r }
+
+set :passenger_restart_with_sudo, true

data/lib/daddy/itamae/i18n.rb

@@ -1,4 +1,5 @@
 require 'i18n'
 I18n.available_locales = [:en, :ja]
 I18n.default_locale = ENV['LANG'].start_with?('ja_') ? :ja : :en
-I18n.load_path += Dir.glob(File.expand_path('../../../itamae/locale/*.yml', __FILE__))
+I18n.load_path += Dir.glob(File.expand_path('../../../../itamae/locale/*.yml', __FILE__))
+I18n.locale = ENV['LANG'][0..1] if ENV['LANG']

data/lib/daddy/version.rb

@@ -1,3 +1,7 @@
 module Daddy
-  VERSION = '0.5.32'
+  VERSION = [
+    VERSION_MAJOR = '0',
+    VERSION_MINOR = '5',
+    VERSION_REVISION = '33'
+  ].join('.')
 end

data/lib/tasks/git.rake

@@ -0,0 +1,12 @@
+require_relative 'task_helper'
+
+namespace :dad do
+  namespace :git do
+
+    desc I18n.t('git.install')
+    task :install do
+      run_itamae 'git/install'
+    end
+
+  end
+end

data/lib/tasks/locale/en.yml

@@ -1,6 +1,8 @@
 en:
   docker:
     install: install Docker
+  git:
+    install: install Git with git-lfs extention
   god:
     install: install God
   jenkins:
@@ -14,12 +16,17 @@ en:
   mysql:
     install: install MySQL/MariaDB
   nginx:
-    config: setting Passenger for app to Nginx
+    config:
+      default: setting Passenger for app to Nginx
+      gitbucket: setting GitBucket as reverse proxy
+      nginx: setting Jenkins as reverse proxy
     install: install Nginx
   obs_studio:
     install: install OBS-Studio
   redis:
     install: install Redis
+  sbt:
+    install: install sbt
   trac:
     install: install Trac
   unicorn:

data/lib/tasks/locale/ja.yml

@@ -1,6 +1,8 @@
 ja:
   docker:
     install: Docker をインストールします
+  git:
+    install: Git をインストールします
   god:
     install: God をインストールします
   jenkins:
@@ -14,12 +16,17 @@ ja:
   mysql:
     install: MySQL/MariaDBをインストールします
   nginx:
-    config: Nginxにアプリの設定ファイルをインストールします
+    config:
+      default: Nginxにアプリの設定ファイルをインストールします
+      gitbucket: NginxにGitBucketのリバースプロキシを設定します
+      jenkins: NginxにJenkinsのリバースプロキシを設定します
     install: Nginxをインストールします
   obs_studio:
     install: OBS-Studioをインストールします
   redis:
     install: Redisをインストールします
+  sbt:
+    install: sbt をインストールします
   trac:
     install: Tracをインストールします
   unicorn:

data/lib/tasks/nginx.rake

@@ -8,7 +8,7 @@ namespace :dad do
       run_itamae 'nginx/install'
     end
 
-    desc I18n.t('nginx.config')
+    desc I18n.t('nginx.config.default')
     task :config do
       ENV['APP_NAME'] ||= app_name
       ENV['SERVER_NAME'] ||= ask('SERVER_NAME', :default => 'localhost', :required => true)
@@ -17,5 +17,21 @@ namespace :dad do
       run_itamae 'nginx/config'
     end
 
+    namespace :config do
+
+      desc I18n.t('nginx.config.gitbucket')
+      task :gitbucket do
+        ENV['SERVER_NAME'] ||= ask('SERVER_NAME', :default => 'localhost', :required => true)
+        ENV['PORT'] = ask('PORT', :default => '8081', :required => true)
+        run_itamae 'nginx/config/gitbucket'
+      end
+
+      desc I18n.t('nginx.config.jenkins')
+      task :jenkins do
+        ENV['SERVER_NAME'] ||= ask('SERVER_NAME', :default => 'localhost', :required => true)
+        run_itamae 'nginx/config/jenkins'
+      end
+
+    end
   end
 end

data/lib/tasks/sbt.rake

@@ -0,0 +1,12 @@
+require_relative 'task_helper'
+
+namespace :dad do
+  namespace :sbt do
+
+    desc I18n.t('sbt.install')
+    task :install do
+      run_itamae 'sbt/install'
+    end
+
+  end
+end

data/lib/tasks/task_helper.rb

@@ -1,6 +1,7 @@
 require 'rake'
 require 'erb'
 require 'yaml'
+require 'highline'
 require File.expand_path('../../daddy/version', __FILE__)
 
 require 'i18n'
@@ -11,12 +12,26 @@ def self.daddy_version
   Daddy::VERSION
 end
 
+def self.cli
+  @_cli ||= HighLine.new
+end
+
 def self.rails_root
   ENV['RAILS_ROOT'] || @_rails_root ||= ask('RAILS_ROOT', :default => Dir.pwd)
 end
 
 def self.rails_env(options = {})
-  ENV['RAILS_ENV'] || @_rails_env ||= ask('RAILS_ENV', :default => options.fetch(:default, 'development'))
+  ret = ENV['RAILS_ENV']
+  unless ret
+    cli.say('RAILS_ENV')
+    @_rails_env ||= cli.choose do |menu|
+      menu.choice 'production'
+      menu.choice 'development'
+      menu.choice 'test'
+      menu.prompt = 'select number above [2]'
+      menu.default = 'development'
+    end
+  end
 end
 
 def self.app_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.32
+  version: 0.5.33
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: holiday_jp
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +285,7 @@ files:
 - itamae/cookbooks/docker/install.rb
 - itamae/cookbooks/docker/registry/install.rb
 - itamae/cookbooks/epel/install.rb
+- itamae/cookbooks/git/install.rb
 - itamae/cookbooks/god/install.rb
 - itamae/cookbooks/jenkins/install.rb
 - itamae/cookbooks/jenkins/plugins/install.rb
@@ -281,6 +296,8 @@ files:
 - itamae/cookbooks/netdata/install.rb
 - itamae/cookbooks/netdata/netdata-installer.sh
 - itamae/cookbooks/nginx/config.rb
+- itamae/cookbooks/nginx/config/gitbucket.rb
+- itamae/cookbooks/nginx/config/jenkins.rb
 - itamae/cookbooks/nginx/install.rb
 - itamae/cookbooks/nginx/modules/nginx-rtmp-module.rb
 - itamae/cookbooks/nginx/modules/passenger.rb
@@ -290,6 +307,7 @@ files:
 - itamae/cookbooks/obs_studio/install.rb
 - itamae/cookbooks/phantomjs/install.rb
 - itamae/cookbooks/redis/install.rb
+- itamae/cookbooks/sbt/install.rb
 - itamae/cookbooks/trac/install.rb
 - itamae/cookbooks/unicorn/install.rb
 - itamae/cookbooks/unicorn/templates/init.d/app.erb
@@ -304,11 +322,13 @@ files:
 - 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/nginx/conf.d/servers/gitbucket.conf.erb
+- itamae/templates/etc/nginx/conf.d/servers/jenkins.conf.erb
 - itamae/templates/etc/nginx/nginx.conf.erb
 - itamae/templates/etc/sysconfig/jenkins.erb
 - itamae/templates/etc/systemd/system/tracd.service.erb
 - itamae/templates/etc/vsftpd/vsftpd.conf.erb
-- itamae/templates/etc/yum.repos.d/docker.repo.erb
+- itamae/templates/etc/yum.repos.d/jenkins.repo.erb
 - itamae/templates/etc/yum.repos.d/nginx.repo.erb
 - itamae/templates/lib/systemd/system/nginx.service.erb
 - lib/capistrano/daddy.rb
@@ -375,9 +395,9 @@ files:
 - lib/tasks/fluentd_nginx.conf.erb
 - lib/tasks/generate/controller.rake
 - lib/tasks/generate/view.rake
+- lib/tasks/git.rake
 - lib/tasks/god.rake
 - lib/tasks/jenkins.rake
-- lib/tasks/jenkins/nginx.conf.erb
 - lib/tasks/kibana.rake
 - lib/tasks/kibana/config.js.erb
 - lib/tasks/kibana/configure.sh
@@ -398,6 +418,7 @@ files:
 - lib/tasks/resque.rake
 - lib/tasks/resque/app.god.erb
 - lib/tasks/resque/install.sh.erb
+- lib/tasks/sbt.rake
 - lib/tasks/task_helper.rb
 - lib/tasks/tesseract.rake
 - lib/tasks/test.rake
@@ -435,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: My rails dad

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

@@ -1,6 +0,0 @@
-[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/tasks/jenkins/nginx.conf.erb

@@ -1,29 +0,0 @@
-# this file is auto-generated by daddy-<%= daddy_version %>
-
-upstream jenkins {
-  server localhost:8080;
-}
-
-server {
-  listen 80;
-  listen 443 ssl;
-  server_name <%= @server_name %>;
-  #access_log /var/log/nginx/jenkins_access.log ltsv;
-<% if @ssl_certificate and @ssl_certificate_key -%>
-  ssl_certificate <%= @ssl_certificate %>;
-  ssl_certificate_key <%= @ssl_certificate_key %>;
-<% end -%>
-  root /var/cache/jenkins/war;
-
-  location / {
-    #auth_basic "Jenkins";
-    #auth_basic_user_file conf.d/.htpasswd;
-    proxy_pass http://jenkins;
-    proxy_redirect http:// https://;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto https;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-User $remote_user;
-  }
-}