itamae-plugin-recipe-daddy 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5304d92e7d416b477f5b60e3f31d6168c2b8d80f36b6e1e449f9a972a80151d1
-  data.tar.gz: f5580ed5f52540b001ff6577a2909b639697e70828968e71c11ca657f5bd811f
+  metadata.gz: 9b92a2bab537dcdb0a6ad5d66c440d074bbed35747bff8280f8547511a89c26f
+  data.tar.gz: 6f66fcba5db0f1b33096428f494c2bd7e5c41fd728a802817b74ab4700a55c6e
 SHA512:
-  metadata.gz: a121adadf0caf0340efa8099b334fd3c76fb7bc9625389923a4b669e847dfc3f88d00c471cb76c3949210d183ae1675e4c0230d0deb3e3807e9ab99e88590ba0
-  data.tar.gz: 26eca664dfa1afac0dfdc37eb9e0bbe3fdc579f275558d977b3eaa91b4da1623f91d7832ba51376d7ec9e86c0f2f70279fb593b10c514e31c5b1b2d11bd3409a
+  metadata.gz: b779f4c9f94dbac651aa5947b733522c04f63f75db2a8a0c413dc45e93043ce45083104f2d35bfafb9ffdd2e2415097b44cd987c851d3db77c75d4a94865dc65
+  data.tar.gz: 044c99a9c8c6bba24e57cad58c5031366c596715fae458bfd2bb30c78a761236e408012baf2fadb7cb573c3b04139f7237330bb55fcfe6139368b6a9b8fe2f32

data/.gitignore

@@ -1,3 +1,4 @@
 /.buildpath
 /.project
 /pkg/
+/Gemfile.lock

data/itamae-plugin-recipe-daddy.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   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_development_dependency "bundler", "~> 2.0"

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

@@ -36,12 +36,12 @@ execute "download nginx-#{version}" do
   command <<-EOF
     wget https://nginx.org/download/nginx-#{version}.tar.gz
   EOF
-  not_if "echo #{::File.read(::File.join(::File.dirname(__FILE__), "nginx-#{version}_sha256sum.txt")).strip} | sha256sum -c"
+  not_if "test -e /opt/openresty/#{version}/INSTALLED || echo #{::File.read(::File.join(::File.dirname(__FILE__), "nginx-#{version}_sha256sum.txt")).strip} | sha256sum -c"
 end
 
 # module sources
 include_recipe 'modules/nginx-rtmp-module'
-include_recipe 'modules/passenger'
+include_recipe 'passenger'
 
 # build
 execute 'build nginx' do
@@ -56,8 +56,10 @@ execute 'build nginx' do
         --conf-path=/etc/nginx/nginx.conf \
         --pid-path=/run/nginx.pid \
         --with-http_ssl_module \
+        --with-http_realip_module \
+        --with-pcre-jit \
         --add-dynamic-module=/opt/nginx-rtmp-module/v#{rtmp_version} \
-        --add-dynamic-module=$(passenger-config --nginx-addon-dir)
+        --add-dynamic-module=/opt/passenger/current/src/nginx_module
       sudo chown -R #{ENV['USER']}:#{ENV['USER']} ./
       make
       sudo make install
@@ -83,7 +85,6 @@ end
 
 %w{
   /etc/nginx/conf.d
-  /var/run/passenger-instreg
 }.each do |name|
   directory name do
     user 'root'
@@ -93,15 +94,6 @@ end
   end
 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
   user 'root'
   owner 'root'
@@ -117,7 +109,7 @@ directory '/etc/nginx/conf.d/servers' do
 end
 
 if app_type
-  include_recipe File.join(File.dirname(File.dirname(__FILE__)), app_type, 'install.rb')
+  include_recipe File.join(File.dirname(File.dirname(__FILE__)), app_type, 'config.rb')
 end
 
 unless ENV['DOCKER']

data/lib/itamae_plugin_recipe_daddy/version.rb

@@ -1,5 +1,5 @@
 module ItamaePluginRecipeDaddy
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 
   NGINX_VERSION = [
     NGINX_VERSION_MAJOR = '1',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.2
+- !ruby/object:Gem::Dependency
+  name: itamae-plugin-recipe-passenger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: itamae-plugin-recipe-selenium
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -103,11 +116,7 @@ files:
 - 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.13.5_sha256sum.txt
-- lib/itamae/plugin/recipe/daddy/nginx/nginx-1.13.9_sha256sum.txt
-- lib/itamae/plugin/recipe/daddy/nginx/nginx-1.14.0_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/nginx/nginx-1.14.2_sha256sum.txt
-- lib/itamae/plugin/recipe/daddy/nginx/nginx-1.16.0_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/nginx/nginx-1.16.1_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/nginx/start.rb
 - lib/itamae/plugin/recipe/daddy/nginx/stop.rb
@@ -119,7 +128,7 @@ files:
 - lib/itamae/plugin/recipe/daddy/opencv/install.rb
 - lib/itamae/plugin/recipe/daddy/opencv/opencv-3.3.1_sha256sum.txt
 - lib/itamae/plugin/recipe/daddy/opencv/opencv-3.4.3_sha256sum.txt
-- lib/itamae/plugin/recipe/daddy/passenger/install.rb
+- lib/itamae/plugin/recipe/daddy/passenger/config.rb
 - lib/itamae/plugin/recipe/daddy/passenger/templates/_passenger.conf.erb
 - lib/itamae/plugin/recipe/daddy/postgresql.rb
 - lib/itamae/plugin/recipe/daddy/python.rb

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    itamae-plugin-recipe-daddy (0.1.18)
-      itamae (~> 1.10, >= 1.10.2)
-      itamae-plugin-recipe-selenium (~> 0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    hashie (3.6.0)
-    itamae (1.10.6)
-      ansi
-      hashie
-      schash (~> 0.1.0)
-      specinfra (>= 2.64.0, < 3.0.0)
-      thor
-    itamae-plugin-recipe-selenium (0.1.0)
-      itamae (~> 1.10, >= 1.10.4)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
-    net-telnet (0.1.1)
-    rake (12.3.3)
-    schash (0.1.2)
-    sfl (2.3)
-    specinfra (2.82.3)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
-    thor (0.20.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  itamae-plugin-recipe-daddy!
-  rake (~> 12.3)
-
-BUNDLED WITH
-   2.0.2

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-4fd376bad78797e7f18094a00f0f1088259326436b537eb5af69b01be2ca1345  nginx-1.16.0.tar.gz