itamae-plugin-recipe-daddy 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b92a2bab537dcdb0a6ad5d66c440d074bbed35747bff8280f8547511a89c26f
-  data.tar.gz: 6f66fcba5db0f1b33096428f494c2bd7e5c41fd728a802817b74ab4700a55c6e
+  metadata.gz: 1c2e6cea8e45da25a0cf71ef457031fe53c843fa0404b2e3226063b5cd3e806a
+  data.tar.gz: d6ce4b83b1100e39e30c3cb7b1ba5206054129de5d181666d0659a08e221634f
 SHA512:
-  metadata.gz: b779f4c9f94dbac651aa5947b733522c04f63f75db2a8a0c413dc45e93043ce45083104f2d35bfafb9ffdd2e2415097b44cd987c851d3db77c75d4a94865dc65
-  data.tar.gz: 044c99a9c8c6bba24e57cad58c5031366c596715fae458bfd2bb30c78a761236e408012baf2fadb7cb573c3b04139f7237330bb55fcfe6139368b6a9b8fe2f32
+  metadata.gz: 4f14ddf9b8fb2c97ee46eb45a584d1986a5bd6d849b50c7a1c9f2391ae7541bda35175e04ba5ac3474c40c5d99ff3f99a8e83da7cd52eee9c382a355121479ce
+  data.tar.gz: 7ac9fd5e195bb844174a466ce38e180085c3d3e1e247ee47e8639bbf87aca65df9399bf4cc3a54ea3f47ad8abad7cad805acbab07334c8447ad00623a5eef515

data/itamae-plugin-recipe-daddy.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'itamae', '~> 1.10', '>= 1.10.2'
   spec.add_dependency 'itamae-plugin-recipe-passenger', '~> 0.1'
   spec.add_dependency 'itamae-plugin-recipe-selenium', '~> 0.1'
+  spec.add_dependency 'itamae-plugin-resource-pip', '~> 1.1'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3"

data/lib/itamae/plugin/recipe/daddy/nginx/nginx-1.18.0_sha256sum.txt

@@ -0,0 +1 @@
+4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99  nginx-1.18.0.tar.gz

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

@@ -31,7 +31,7 @@ http {
 
   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_root /opt/passenger/current;
   passenger_instance_registry_dir /var/run/passenger-instreg;
 
   server {

data/lib/itamae_plugin_recipe_daddy/version.rb

@@ -1,10 +1,10 @@
 module ItamaePluginRecipeDaddy
-  VERSION = '0.1.19'
+  VERSION = '0.1.20'
 
   NGINX_VERSION = [
     NGINX_VERSION_MAJOR = '1',
-    NGINX_VERSION_MINOR = '16',
-    NGINX_VERSION_PATCH = '1'
+    NGINX_VERSION_MINOR = '18',
+    NGINX_VERSION_PATCH = '0'
   ].join('.')
   
   NGINX_RTMP_MODULE_VERSION = [
@@ -19,12 +19,6 @@ module ItamaePluginRecipeDaddy
     OPENCV_VERSION_PATCH = '1'
   ].join('.')
 
-  PASSENGER_VERSION = [
-    PASSENGER_VERSION_MAJOR = '6',
-    PASSENGER_VERSION_MINOR = '0',
-    PASSENGER_VERSION_PATCH = '2'
-  ].join('.')
-
   PYTHON_VERSION = [
     PYTHON_VERSION_MAJOR = '3',
     PYTHON_VERSION_MINOR = '6',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: itamae-plugin-resource-pip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,10 +128,10 @@ files:
 - lib/itamae/plugin/recipe/daddy/nginx.rb
 - lib/itamae/plugin/recipe/daddy/nginx/install.rb
 - lib/itamae/plugin/recipe/daddy/nginx/modules/nginx-rtmp-module.rb
-- lib/itamae/plugin/recipe/daddy/nginx/modules/passenger.rb
 - lib/itamae/plugin/recipe/daddy/nginx/nginx-1.13.12_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/nginx/nginx-1.14.2_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/nginx/nginx-1.16.1_sha256sum.txt
+- lib/itamae/plugin/recipe/daddy/nginx/nginx-1.18.0_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/nginx/start.rb
 - lib/itamae/plugin/recipe/daddy/nginx/stop.rb
 - lib/itamae/plugin/recipe/daddy/nginx/templates/etc/nginx/conf.d/default.conf.erb

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

@@ -1,14 +0,0 @@
-version = ENV['PASSENGER_VERSION'] || ItamaePluginRecipeDaddy::PASSENGER_VERSION
-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
-  user 'root'
-  subscribes :run, 'gem_package[passenger]'
-  action :nothing
-end