capistrano-nginx-unit 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dfbf4cd4d51bb5c132d0ff26b209f675e6b02fcf32497036b446f1722b1187d0
-  data.tar.gz: 95d3d5c4f3802991cdd5212b1d67959533842388ced9fc283f8177610960ed8f
+SHA1:
+  metadata.gz: bb9b313061e9ebe5acc0552f525561bdb8967df4
+  data.tar.gz: 861bf5143c2f2cc4f316cb0219f28f0d0d31f9f4
 SHA512:
-  metadata.gz: 8de735ebdbf54bfebe7c825d263e6b092655f7a4ad7846cdec1b5afbf4bd41064cda74c2f0e5956561833b9c7527b2aa426ff47f88bd48045830a9c571d0527b
-  data.tar.gz: 741cd3660ef11bef3ae4d9dd1076a0beebfddae9863e0fde356a353c9e78bb98ed3b4e093c2d8468b7ba84d09b5c8eeb1dc6773a6126f1670e58e284a4fb80b7
+  metadata.gz: 75db8120290fc484d8c5462903db5280408addbc905cb9430f730490edfa803f92fcb2bf7933ac25cb9022540dfa4cfcf524d64c1deb62f478d85d6fe36565ea
+  data.tar.gz: 8df07306ce000f37bcf6d7fc39124290dbb17032f6e44199e67dd1e0ba6555131bcf62487a2130f1ad58e86f28e9102bb76190de00876c5b3d67d0b911ae215f

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /tmp/
 /vendor/
+
+Gemfile.lock

data/README.md

@@ -45,6 +45,7 @@ after "deploy:published", "nginx_unit:attach"
 set :nginx_unit_roles,        -> { :app }
 set :nginx_unit_control_sock, -> { "/var/run/control.unit.sock" }
 set :nginx_unit_listen,       -> { "*:3000" }
+set :nginx_unit_listener,     -> { { pass: "applications/#{fetch(:nginx_unit_app_name)}" } }
 set :nginx_unit_app_name,     -> { fetch(:application) }
 set :nginx_unit_processes,    -> { nil }
 set :nginx_unit_user,         -> { nil }
@@ -52,6 +53,7 @@ set :nginx_unit_group,        -> { nil }
 set :nginx_unit_working_dir,  -> { nil }
 set :nginx_unit_script,       -> { "config.ru" }
 set :nginx_unit_environment,  -> { {} }
+set :nginx_unit_limits,       -> { nil }
 ```
 
  - `:nginx_unit_roles`
@@ -67,6 +69,13 @@ set :nginx_unit_environment,  -> { {} }
    IP Address and port where rack application listens on. Default: `"*:3000"`    
    See [Listeners configuration](https://unit.nginx.org/configuration/#listeners)
 
+ - `:nginx_unit_listener`
+
+   Listener configuration of rack application processes. Default: `{ pass: "applications/#{fetch(:nginx_unit_app_name)}" }`  
+   If you are using Nginx UNIT that doesn\`t support `pass` option, you can overwrite this configuration with `{ application: fetch(:nginx_unit_app_name) }`  
+   (However, `application` option is currently deprecated.)  
+   See [Listeners configuration](https://unit.nginx.org/configuration/#listeners)
+
  - `:nginx_unit_app_name`
 
    Application name.  
@@ -75,10 +84,10 @@ set :nginx_unit_environment,  -> { {} }
  - `:nginx_unit_processes`
    
    Number of rack application processes. Default: `1`  
-   See [Application Object configuration](https://unit.nginx.org/configuration/#application-objects)
+   You can also set the `Hash` that has keys `max`, `spare` and `idle_timeout`.  
+   See [Processes and Limits](https://unit.nginx.org/configuration/#processes-and-limits)
 
- - `:nginx_unit_user`
- - `:nginx_unit_group`
+ - `:nginx_unit_user`, `:nginx_unit_group`
 
    Username and group of rack application process. Default: `"nobody"`  
    See [Application Object configuration](https://unit.nginx.org/configuration/#application-objects)
@@ -97,4 +106,9 @@ set :nginx_unit_environment,  -> { {} }
 
    Environment variable setting. Default value is empty.  
    This variable accepts `Hash`. e.g., `{ "RAILS_ENV" => "production" }`.
-   
+   
+ - `:nginx_unit_limits`
+   
+   Request limits of rack application processes. Default: `nil`(not specified)  
+   You can set the `Hash` that has keys `requests` and `timeout`.  
+   See [Processes and Limits](https://unit.nginx.org/configuration/#processes-and-limits)

data/lib/capistrano/nginx-unit/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  NGINX_UNIT_VERSION = "0.8.0"
+  NGINX_UNIT_VERSION = "0.9.0"
 end

data/lib/capistrano/tasks/nginx-unit.rake

@@ -3,6 +3,7 @@ namespace :load do
     set :nginx_unit_roles,        -> { :app }
     set :nginx_unit_control_sock, -> { "/var/run/control.unit.sock" }
     set :nginx_unit_listen,       -> { "*:3000" }
+    set :nginx_unit_listener,     -> { { pass: "applications/#{fetch(:nginx_unit_app_name)}" } }
     set :nginx_unit_app_name,     -> { fetch(:application) }
     set :nginx_unit_processes,    -> { nil }
     set :nginx_unit_user,         -> { nil }
@@ -10,6 +11,7 @@ namespace :load do
     set :nginx_unit_working_dir,  -> { nil }
     set :nginx_unit_script,       -> { "config.ru" }
     set :nginx_unit_environment,  -> { {} }
+    set :nginx_unit_limits,       -> { nil }
   end
 end
 
@@ -40,7 +42,7 @@ namespace :nginx_unit do
   desc "Attach listener configuration to NGINX Unit"
   task :attach_listener do
     on release_roles(fetch(:nginx_unit_roles)) do
-      listener_json = JSON.generate("application" => fetch(:application))
+      listener_json = JSON.generate(fetch(:nginx_unit_listener))
       control_nginx_unit(:put, path: "/listeners/#{fetch(:nginx_unit_listen)}", json: listener_json)
     end
   end
@@ -58,7 +60,8 @@ namespace :nginx_unit do
         group: fetch(:nginx_unit_group),
         working_directory: fetch(:nginx_unit_working_dir) || released_dir,
         script: File.join(released_dir, fetch(:nginx_unit_script)),
-        environment: fetch(:nginx_unit_environment)
+        environment: fetch(:nginx_unit_environment),
+        limits: fetch(:nginx_unit_limits),
       }.reject { |_, v| v.respond_to?(:empty?) ? v.empty? : v.nil? })
 
       control_nginx_unit(:put, path: "/applications/#{fetch(:nginx_unit_app_name)}", json: app_json)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nginx-unit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - murakmii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: The Capistrano 3.x task to run rack application on NGINX Unit