daddy 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3102a8b6e08e245df64188754a6337a63185a3d381962b935987f815de1976
-  data.tar.gz: d65a8c0dc2ff0055ca400b314bcf32a7cf3cdbac55f934d9c08cebe7e066c5b9
+  metadata.gz: 707ebdbd2d51ef70d79928ef00a1556f16bb19268fdb05528a3cad8f4f2bf775
+  data.tar.gz: 264264067d5066726ed9c7aaa3178ca4adf880b93249a1b2b0cbad6a56381362
 SHA512:
-  metadata.gz: 62f31c2be1714851eb95f9d26f821fb01a381731de9cdba7fa64917e3212057c9ce189f5f075272a87ae75fd39c479fc80d7f042b7af2fd2b074b9bf79c132c8
-  data.tar.gz: bea036994fe6c9d596d3a256226e8a22b56df4055f1214f738e4ecaa1211200201a9bc212c3c49b2399484f654f09ddbb970f09806c3eceb49f2473e385cdb2e
+  metadata.gz: 133d703d10a6f2e48d78651f87c12b523813ea2fb509888adcda5204c5bdce0fed10dca06de96e8c7384eaef8ec29d4a72d9785b5a94804383e2b0841eb0ddf9
+  data.tar.gz: ea2bb2dface42cf16a15001c67d17435337680b21c6212e64b8bdd5638d1565b243baf9906e947736af99e918f8fa0332a556d895532d890ca2fdcefa9ec0bef

data/itamae/environments/nodejs.rb

@@ -1,2 +1,2 @@
 include_recipe 'base'
-include_recipe 'nodejs:install'
+include_recipe 'nodejs/install'

data/itamae/environments/nodejs/templates/etc/yum.repos.d/nodesource.repo.erb

@@ -1,6 +1,6 @@
 [nodesource]
 name=Node.js Packages for Enterprise Linux 7 - $basearch
-baseurl=https://rpm.nodesource.com/pub/el/7/$basearch
+baseurl=https://rpm.nodesource.com/pub_8.x/el/7/$basearch
 failovermethod=priority
 enabled=1
 gpgcheck=1
@@ -8,7 +8,7 @@ gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL
 
 [nodesource-source]
 name=Node.js for Enterprise Linux 7 - $basearch - Source
-baseurl=https://rpm.nodesource.com/pub/el/7/SRPMS
+baseurl=https://rpm.nodesource.com/pub_8.x/el/7/SRPMS
 failovermethod=priority
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL

data/lib/daddy/itamae.rb

@@ -1,4 +1,5 @@
 require 'itamae'
+require 'itamae-plugin-recipe-daddy'
 require_relative 'itamae/config'
 require_relative 'itamae/i18n'
 

data/lib/daddy/version.rb

@@ -2,7 +2,7 @@ module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
     VERSION_MINOR = '7',
-    VERSION_REVISION = '2'
+    VERSION_REVISION = '3'
   ].join('.')
 
   CHROME_DRIVER_VERSION = [
@@ -16,18 +16,6 @@ module Daddy
     GECKO_DRIVER_VERSION_REVISION = '1'
   ].join('.')
 
-  NGINX_VERSION = [
-    NGINX_VERSION_MAJOR = '1',
-    NGINX_VERSION_MINOR = '14',
-    NGINX_VERSION_REVISION = '0'
-  ].join('.')
-
-  PASSENGER_VERSION = [
-    PASSENGER_VERSION_MAJOR = '5',
-    PASSENGER_VERSION_MINOR = '3',
-    PASSENGER_VERSION_REVISION = '2'
-  ].join('.')
-
   PYTHON_VERSION = [
     PYTHON_VERSION_MAJOR = '3',
     PYTHON_VERSION_MINOR = '6',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -307,13 +307,6 @@ files:
 - itamae/cookbooks/nginx/config/rails.rb
 - itamae/cookbooks/nginx/config/templates/_passenger.conf.erb
 - itamae/cookbooks/nginx/config/templates/unicorn.conf.erb
-- itamae/cookbooks/nginx/install.rb
-- itamae/cookbooks/nginx/modules/nginx-rtmp-module.rb
-- itamae/cookbooks/nginx/modules/passenger.rb
-- itamae/cookbooks/nginx/nginx-1.13.12_sha256sum.txt
-- itamae/cookbooks/nginx/nginx-1.13.5_sha256sum.txt
-- itamae/cookbooks/nginx/nginx-1.13.9_sha256sum.txt
-- itamae/cookbooks/nginx/nginx-1.14.0_sha256sum.txt
 - itamae/cookbooks/obs_studio/install.rb
 - itamae/cookbooks/phantomjs/install.rb
 - itamae/cookbooks/python/Python-3.6.3_sha256sum.txt
@@ -346,20 +339,16 @@ files:
 - itamae/templates/etc/init.d/god.erb
 - itamae/templates/etc/logrotate.d/god.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/tmpfiles.d/passenger.conf.erb
 - itamae/templates/etc/vsftpd/vsftpd.conf.erb
 - itamae/templates/etc/yum.repos.d/google-chrome.repo.erb
 - itamae/templates/etc/yum.repos.d/jenkins.repo.erb
 - itamae/templates/etc/yum.repos.d/mongodb-org.repo.erb
 - itamae/templates/etc/yum.repos.d/nginx.repo.erb
 - itamae/templates/etc/yum.repos.d/vbatts-bazel.repo.erb
-- itamae/templates/lib/systemd/system/nginx.service.erb
 - lib/capistrano/daddy.rb
 - lib/capistrano/tasks/clear_cache.rake
 - lib/capistrano/tasks/update_linked_files.rake

data/itamae/cookbooks/nginx/install.rb

@@ -1,123 +0,0 @@
-require 'daddy/itamae'
-
-version = ENV['NGINX_VERSION']
-
-directory 'tmp'
-
-# install destination
-%w{
-  /opt/nginx
-  /opt/nginx/cache
-  /opt/nginx/shared
-  /opt/nginx/shared/logs
-}.each do |name|
-  directory name do
-    user 'root'
-    owner 'root'
-    group 'root'
-    mode '755'
-  end
-end
-
-# nginx source
-execute 'download nginx' do
-  cwd 'tmp'
-  command <<-EOF
-    wget https://nginx.org/download/nginx-#{version}.tar.gz
-  EOF
-  not_if "sha256sum -c #{::File.join(::File.dirname(__FILE__), "nginx-#{version}_sha256sum.txt")}"
-end
-
-# module sources
-include_recipe 'modules/nginx-rtmp-module'
-include_recipe 'modules/passenger'
-
-# build
-execute 'build nginx' do
-  cwd 'tmp'
-  command <<-EOF
-    rm -Rf nginx-#{version}/
-    tar zxf nginx-#{version}.tar.gz
-    pushd nginx-#{version}
-      sudo ./configure \
-        --prefix=/opt/nginx/nginx-#{version} \
-        --conf-path=/etc/nginx/nginx.conf \
-        --pid-path=/run/nginx.pid \
-        --with-http_ssl_module \
-        --add-dynamic-module=/opt/nginx-rtmp-module/v1.1.11 \
-        --add-dynamic-module=$(passenger-config --nginx-addon-dir)
-      sudo chown -R #{ENV['USER']}:#{ENV['USER']} ./
-      make
-      sudo make install
-    popd
-  EOF
-  not_if "test -e /opt/nginx/nginx-#{version}"
-end
-
-link 'current' do
-  user 'root'
-  cwd '/opt/nginx'
-  to "nginx-#{version}"
-  force true
-end
-
-template '/etc/nginx/nginx.conf' do
-  user 'root'
-  owner 'root'
-  group 'root'
-  mode '644'
-end
-
-%w{
-  /etc/nginx/conf.d
-  /var/run/passenger-instreg
-}.each do |name|
-  directory name do
-    user 'root'
-    owner 'root'
-    group 'root'
-    mode '755'
-  end
-end
-
-case os_version
-when /rhel-6\.(.*?)/
-when /rhel-7\.(.*?)/
-  template '/etc/tmpfiles.d/passenger.conf' do
-    user 'root'
-    owner 'root'
-    group 'root'
-    mode '644'
-    variables :path => '/var/run/passenger-instreg',
-        :owner => 'root', :group => 'root', :mode => '0755'
-    end
-end
-
-template '/etc/nginx/conf.d/default.conf' do
-  user 'root'
-  owner 'root'
-  group 'root'
-  mode '644'
-end
-
-directory '/etc/nginx/conf.d/servers' do
-  user 'root'
-  owner 'root'
-  group 'root'
-  mode '755'
-end
-
-template '/lib/systemd/system/nginx.service' do
-  user 'root'
-end
-
-execute 'systemctl daemon-reload' do
-  user 'root'
-  subscribes :run, 'template[/lib/systemd/system/nginx.service]'
-  action :nothing
-end
-
-service 'nginx' do
-  user 'root'
-  action :enable
-end

data/itamae/cookbooks/nginx/modules/nginx-rtmp-module.rb

@@ -1,11 +0,0 @@
-directory '/opt/nginx-rtmp-module' do
-  user 'root'
-  owner ENV['USER']
-  group ENV['USER']
-  mode '755'
-end
-
-git '/opt/nginx-rtmp-module/v1.1.11' do
-  repository 'https://github.com/arut/nginx-rtmp-module.git'
-  revision 'v1.1.11'
-end

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

@@ -1,10 +0,0 @@
-gem_package 'passenger' do
-  user 'root'
-  version Daddy::PASSENGER_VERSION
-end
-
-execute "rm -Rf /opt/nginx/nginx-#{Daddy::NGINX_VERSION}" do
-  user 'root'
-  subscribes :run, 'gem_package[passenger]'
-  action :nothing
-end

data/itamae/cookbooks/nginx/nginx-1.13.12_sha256sum.txt

@@ -1 +0,0 @@
-fb92f5602cdb8d3ab1ad47dbeca151b185d62eedb67d347bbe9d79c1438c85de  nginx-1.13.12.tar.gz

data/itamae/cookbooks/nginx/nginx-1.13.5_sha256sum.txt

@@ -1 +0,0 @@
-0e75b94429b3f745377aeba3aff97da77bf2b03fcb9ff15b3bad9b038db29f2e  nginx-1.13.5.tar.gz

data/itamae/cookbooks/nginx/nginx-1.13.9_sha256sum.txt

@@ -1 +0,0 @@
-5faea18857516fe68d30be39c3032bd22ed9cf85e1a6fdf32e3721d96ff7fa42  nginx-1.13.9.tar.gz

data/itamae/cookbooks/nginx/nginx-1.14.0_sha256sum.txt

@@ -1 +0,0 @@
-5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5  nginx-1.14.0.tar.gz

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

@@ -1,44 +0,0 @@
-http {
-  include       mime.types;
-  default_type  application/octet-stream;
-  ssl_protocols  TLSv1.1 TLSv1.2;
-
-  log_format  ltsv  'time:$time_local\t'
-                    'msec:$msec\t'
-                    'host:$remote_addr\t'
-                    'forwardedfor:$http_x_forwarded_for\t'
-                    'req:$request\t'
-                    'method:$request_method\t'
-                    'uri:$request_uri\t'
-                    'status:$status\t'
-                    'size:$body_bytes_sent\t'
-                    'referer:$http_referer\t'
-                    'ua:$http_user_agent\t'
-                    'reqtime:$request_time\t'
-                    'upsttime:$upstream_response_time\t'
-                    'cache:$upstream_http_x_cache\t'
-                    'runtime:$upstream_http_x_runtime\t'
-                    'vhost:$host';
-
-  access_log  /opt/nginx/shared/logs/access.log  ltsv;
-
-  sendfile        on;
-  #tcp_nopush     on;
-
-  keepalive_timeout  65;
-
-  #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;
-
-  server {
-    listen 80 default_server;
-    server_name _;
-    deny all;
-  }
-
-  include /etc/nginx/conf.d/servers/*.conf;
-}

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

@@ -1,11 +0,0 @@
-user  nobody;
-worker_processes  1;
-
-load_module modules/ngx_http_passenger_module.so;
-load_module modules/ngx_rtmp_module.so;
-
-events {
-  worker_connections  1024;
-}
-
-include /etc/nginx/conf.d/*.conf;

data/itamae/templates/etc/tmpfiles.d/passenger.conf.erb

@@ -1 +0,0 @@
-d <%= @path %> <%= @mode %> <%= @owner %> <%= @group %>

data/itamae/templates/lib/systemd/system/nginx.service.erb

@@ -1,15 +0,0 @@
-[Unit]
-Description=The NGINX HTTP and reverse proxy server
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/opt/nginx/current/sbin/nginx -t
-ExecStart=/opt/nginx/current/sbin/nginx
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s QUIT $MAINPID
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target