itamae-plugin-recipe-daddy 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398e072f6066ab89fa0fd47e5203a8717db032c7881b5a44408f0ea706b73894
-  data.tar.gz: b3c2b6e37b7c4385f6a0693fb5e3df68bcfe340a77931f829ef838f8567675fd
+  metadata.gz: ac8298c284cf637a3e297c0283fb0a8cb982bc25d713ca99ade9d22ddeff6f4f
+  data.tar.gz: 6a0c88646e4a7be6823dfe46f218bc28207b9901fab1aa2633d5febe08ea0cb8
 SHA512:
-  metadata.gz: ce542e953f796159069223c6a3b5b4d8e0384b045897f434899e508d9011f59dcf5f2e1b61e1d24db50bda30a68699e79f6cf49bb31bcee8abc9be57d348446d
-  data.tar.gz: 7eb0a44d4531ae86f0f7417acb2ef59540e7189c6bf68b4c3d9bc29e0d1339c8c69d3a095e23424b69875709601ebd4b2e4e873b84b8d1b3b5c2c9b157168c67
+  metadata.gz: b8f6a514cc12759a0fd1f92d8cec6a06d0aa2e712a3ff12c02d7a378467dc61fd2a3d12dfa8ebc6ca764fbfbc3f9284e5ebcfdee15cb64ca7ccf4977d09e838b
+  data.tar.gz: 0bbe86a9bd5237cb3879d2f0472473c081cf2c58fc73102d0d21c2fb0ba01b631f5c0f112f195fa115559b199ad45eb903d551de0d5b5904255d514bf456acfa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    itamae-plugin-recipe-daddy (0.1.8)
+    itamae-plugin-recipe-daddy (0.1.11)
       itamae (~> 1.10, >= 1.10.2)
 
 GEM

data/lib/itamae/plugin/recipe/daddy/mysql.rb

@@ -0,0 +1 @@
+include_recipe 'daddy::mysql::install'

data/lib/itamae/plugin/recipe/daddy/nginx.rb

@@ -1 +1,3 @@
+include_recipe 'daddy::nginx::stop' unless ENV['DOCKER']
 include_recipe 'daddy::nginx::install'
+include_recipe 'daddy::nginx::start' unless ENV['DOCKER']

data/lib/itamae/plugin/recipe/daddy/nginx/install.rb

@@ -1,8 +1,7 @@
 require 'daddy/itamae'
 
 version = ENV['NGINX_VERSION'] || ItamaePluginRecipeDaddy::NGINX_VERSION
-
-directory 'tmp'
+rtmp_version = ENV['NGINX_RTMP_MODULE_VERSION'] || ItamaePluginRecipeDaddy::NGINX_RTMP_MODULE_VERSION
 
 # install destination
 %w{
@@ -31,12 +30,12 @@ end
 end
 
 # nginx source
-execute 'download nginx' do
+execute "download nginx-#{version}" do
   cwd '/var/daddy/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")}"
+  not_if "echo #{::File.read(::File.join(::File.dirname(__FILE__), "nginx-#{version}_sha256sum.txt")).strip} | sha256sum -c"
 end
 
 # module sources
@@ -47,6 +46,7 @@ include_recipe 'modules/passenger'
 execute 'build nginx' do
   cwd '/var/daddy/tmp'
   command <<-EOF
+    set -eu
     rm -Rf nginx-#{version}/
     tar zxf nginx-#{version}.tar.gz
     pushd nginx-#{version}
@@ -55,7 +55,7 @@ execute 'build nginx' do
         --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=/opt/nginx-rtmp-module/v#{rtmp_version} \
         --add-dynamic-module=$(passenger-config --nginx-addon-dir)
       sudo chown -R #{ENV['USER']}:#{ENV['USER']} ./
       make
@@ -91,17 +91,13 @@ end
   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
+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
 
 template '/etc/nginx/conf.d/default.conf' do
@@ -124,17 +120,14 @@ if Daddy.config.app?
   end
 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]', :immediately
-  action :nothing
-end
-
-service 'nginx' do
-  user 'root'
-  action :enable
+unless ENV['DOCKER']
+  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]', :immediately
+    action :nothing
+  end
 end

data/lib/itamae/plugin/recipe/daddy/nginx/modules/passenger.rb

@@ -4,6 +4,7 @@ nginx_version = ENV['NGINX_VERSION'] || ItamaePluginRecipeDaddy::NGINX_VERSION
 gem_package 'passenger' do
   user 'root'
   version version
+  options ['--verbose'] # to avoid read timeout error on docker
 end
 
 execute "rm -Rf /opt/nginx/nginx-#{nginx_version}" do

data/lib/itamae/plugin/recipe/daddy/nginx/templates/etc/tmpfiles.d/passenger.conf.erb

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

data/lib/itamae_plugin_recipe_daddy/version.rb

@@ -1,5 +1,5 @@
 module ItamaePluginRecipeDaddy
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 
   CHROME_DRIVER_VERSION = [
     CHROME_DRIVER_VERSION_MAJOR = '2',
@@ -33,7 +33,7 @@ module ItamaePluginRecipeDaddy
   PASSENGER_VERSION = [
     PASSENGER_VERSION_MAJOR = '6',
     PASSENGER_VERSION_MINOR = '0',
-    PASSENGER_VERSION_PATCH = '0'
+    PASSENGER_VERSION_PATCH = '1'
   ].join('.')
 
   PYTHON_VERSION = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -79,6 +79,7 @@ files:
 - lib/itamae/plugin/recipe/daddy/bazel/install.rb
 - lib/itamae/plugin/recipe/daddy/bazel/templates/yum.repos.d/vbatts-bazel.repo.erb
 - lib/itamae/plugin/recipe/daddy/memcached/install.rb
+- lib/itamae/plugin/recipe/daddy/mysql.rb
 - lib/itamae/plugin/recipe/daddy/mysql/install.rb
 - lib/itamae/plugin/recipe/daddy/mysql/mysql_secure_installation.sh
 - lib/itamae/plugin/recipe/daddy/mysql/templates/daddy.cnf.erb