capistrano3-puma 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dffe2e6d7acd8609d461724c7642b82b97fa295
-  data.tar.gz: a8c41d024f7f2b6bd8c937bd0185336b4a8c6457
+  metadata.gz: 28c9c75dc6f8d76315e7c45f93ae6bd942057082
+  data.tar.gz: 7853f2ad6ded69548d582ab4e1d7ec8b8d537955
 SHA512:
-  metadata.gz: de9b854942c7d24771f3ecf4e35b2bac4d02ce2160fbe7442bc92b9c2c3ccaf7b1b720c19d015bf3341a8fc399f46d76785be0148e7f8146e234b9db1b9958da
-  data.tar.gz: 75f4993e93161a83ce5a72777387e81b0b8035f9f201a07c86a0b5536ec2eb901bde1b7b2ff24bebd30da95d161cfeaf244adea0cd04ce423a4b8d0279485ed7
+  metadata.gz: 3cf44c290adb44ccaa6a600426e25afb8a24e063cc3dd64c6f1fc154fea4c7aca19b700221e7d885fcc32305b3bf5f78419d15730639d98d9e7fe17e8a54d3ec
+  data.tar.gz: 17b823002d40963e1d67a6e968f59d96ab108627bda03d7af9275bcf31773de254620ca0daf86fe70eaf0da37712b30628d1ff9a0e022becc1068b409beac292

data/CHANGELOG.md

@@ -0,0 +1,40 @@
+## Changelog
+- 2.0.0: 
+ - Require puma 3.4+
+ - Require Capistrano 3.5+
+ - Require capistrano-bundler
+ 
+- 1.2.0: add support for puma user for puma user @mcb & @seuros
+- 1.1.0: Set :puma_preload_app to false; Reload Monit after uploading any monit configuration; Always refresh Gemfile @rafaelgoulart @suhailpatel @sime
+- 1.0.0: Add activate control app @askagirl
+- 0.8.5: Fix smart_restart task to check if puma preloads app
+- 0.8.4: Allow patch method (Nginx template) @lonre
+- 0.8.2: Start task creates a conf file if none exists @stevemadere
+- 0.8.1: Fixed nginx task @hnatt, support for prune_bundler @behe
+- 0.8.0: Some changes
+- 0.7.0: added Nginx template generator  @dfang
+- 0.6.1: added :puma_default_hooks, you can turn off the automatic hooks by setting it false
+- 0.6.0: Remove `daemonize true` from default puma.rb file. Explicitly pass `--daemon` flag when needed.
+- 0.5.1: Added worker_timeout option
+- 0.5.0: Bugs fixes
+- 0.4.2: Fix monit template to support chruby
+- 0.4.1: Fix puma jungle (debian)
+- 0.4.0: Multi-bind support
+- 0.3.7: Dependency bug fix
+- 0.3.5: Fixed a prehistoric bug
+- 0.3.4: I don't remember what i did here
+- 0.3.3: Puma jungle start fix
+- 0.3.2: Tag option support (require puma  2.8.2+)
+- 0.3.1: Typo fix
+- 0.3.0: Initial support for puma signals
+- 0.2.2: Application pre-loading is optional now (set puma_preload_app to false to turn it off)
+- 0.2.1: Tasks are run within rack context
+- 0.2.0: Support for puma `ActiveRecord::Base.establish_connection` on
+  boot
+- 0.1.3: Capistrano 3.1 support
+- 0.1.2: Gemfile are refreshed between deploys now
+- 0.1.1: Initial support for Monit and configuration override added.
+- 0.1.0: Phased restart will be used if puma is in cluster mode
+- 0.0.9: puma.rb location changed to shared_path root. puma:check moved to after deploy:check
+- 0.0.8: puma.rb is automatically generated if not present. Fixed RVM issue.
+- 0.0.7: Gem pushed to rubygems as capistrano3-puma. Support of Redhat based OS for Jungle init script.

data/CONTRIBUTORS.md

@@ -0,0 +1,45 @@
+## Contributors
+
+Abdelkader Boudih
+André Arko
+Ariel Zerahia
+ayaya
+Bin Huang
+Bryan Liles
+Claudio Poli
+Cyril Rohr
+dfang
+Fritz Lee
+Hnat Kubov
+Ivan Schneider
+James-Hendrickson
+Jens Hausherr
+Jeremy Rottman
+Jesse Cooke
+Johan Lind
+Jordan Hollinger
+Jun Lin
+Kamil Giszczak
+Kevin Collignon
+Konstantin Papkovskiy
+Kyle Decot
+Lisa Hagemann
+Lonre Wang
+marshall-lee
+Matias De Santi
+Michael C. Beck
+Molfar
+msbrigna
+Neil Bartley
+Peter
+Ponomarev Nikolay
+Rafael Goulart
+RavWar
+ruohan.chen
+Ruslan
+Sergey Ponomarev
+Shane O'Grady
+Simon Males
+Steve Madere
+Suhail Patel
+Suraj Shirvankar

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2015 Abdelkader Boudih
+Copyright (c) 2013-2016 Abdelkader Boudih
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -26,58 +26,58 @@ And then execute:
     require 'capistrano/puma/nginx'   # if you want to upload a nginx site template
 ```
 
-then you can use ```cap -vT``` to list tasks
+### Config
+
+To list available tasks use `cap -T`
+
+To upload puma config use:
+```ruby
+cap puma:config 
 ```
-cap puma:nginx_config # upload a nginx site config(eg. /etc/nginx/sites-enabled/)
-cap puma:config  # upload puma config(eg. shared/puma.config)
+By default the file located in  `shared/puma.config`
+
+
+Ensure that `tmp/pids` and ` tmp/sockets log` are shared (via `linked_dirs`):
+
+`This step is mandatory before deploying, otherwise puma server won't start`
+
+### Nginx
+
+To upload a nginx site config (eg. /etc/nginx/sites-enabled/) use:
+```ruby
+cap puma:nginx_config
 ```
-you may want to customize these two templates locally before uploading
+
+To customize these two templates locally before uploading use:
 ```
 rails g capistrano:nginx_puma:config
 ```
 
-if your nginx server configuration is not located in /etc/nginx, you may need to customize nginx_sites_available_path and nginx_sites_enabled_path
-```
+if your nginx server configuration is not located in `/etc/nginx`, you may need to customize:
+```ruby
 set :nginx_sites_available_path, "/etc/nginx/sites-available"
 set :nginx_sites_enabled_path, "/etc/nginx/sites-enabled"
 ```
 
-By default, ```nginx_config``` will be executed with ```:web``` role. But you can assign it to a different role:
-```
+By default, `nginx_config` will be executed with `:web` role. But you can assign it to a different role:
+```ruby
 set :puma_nginx, :foo
 ```
 or define a standalone one:
-```
+```ruby
 role :puma_nginx, %w{root@example.com}
 ```
 
-Configurable options, shown here with defaults: Please note the configuration options below are not required unless you are trying to override a default setting, for instance if you are deploying on a host on which you do not have sudo or root privileges and you need to restrict the path. These settings go in the deploy.rb file.
+### Jungle
 
-```ruby
-    set :puma_user, fetch(:user)
-    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
-    set :puma_state, "#{shared_path}/tmp/pids/puma.state"
-    set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
-    set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
-    set :puma_default_control_app, "unix://#{shared_path}/tmp/sockets/pumactl.sock"
-    set :puma_conf, "#{shared_path}/puma.rb"
-    set :puma_access_log, "#{shared_path}/log/puma_access.log"
-    set :puma_error_log, "#{shared_path}/log/puma_error.log"
-    set :puma_role, :app
-    set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
-    set :puma_threads, [0, 16]
-    set :puma_workers, 0
-    set :puma_worker_timeout, nil
-    set :puma_init_active_record, false
-    set :puma_preload_app, true
-    set :nginx_use_ssl, false
-```
 For Jungle tasks (beta), these options exist:
 ```ruby
     set :puma_jungle_conf, '/etc/puma.conf'
     set :puma_run_path, '/usr/local/bin/run-puma'
 ```
 
+### Multi bind
+
 Multi-bind can be set with an array in the puma_bind variable
 ```ruby
   set :puma_bind, %w(tcp://0.0.0.0:9292 unix:///tmp/puma.sock)
@@ -85,63 +85,37 @@ Multi-bind can be set with an array in the puma_bind variable
     * Listening on tcp://0.0.0.0:9220
     * Listening on unix:///tmp/puma.sock
 
+### Active Record
 
 For ActiveRecord the following line to your deploy.rb
 ```ruby
     set :puma_init_active_record, true
 ```
 
-Ensure that the following directories are shared (via ``linked_dirs``):
-
-    tmp/pids tmp/sockets log
-
-## Changelog
-- 1.2.0: add support for puma user for puma user @mcb & @seuros
-- 1.1.0: Set :puma_preload_app to false; Reload Monit after uploading any monit configuration; Always refresh Gemfile @rafaelgoulart @suhailpatel @sime
-- 1.0.0: Add activate control app @askagirl
-- 0.8.5: Fix smart_restart task to check if puma preloads app
-- 0.8.4: Allow patch method (Nginx template) @lonre
-- 0.8.2: Start task creates a conf file if none exists @stevemadere
-- 0.8.1: Fixed nginx task @hnatt, support for prune_bundler @behe
-- 0.8.0: Some changes
-- 0.7.0: added Nginx template generator  @dfang
-- 0.6.1: added :puma_default_hooks, you can turn off the automatic hooks by setting it false
-- 0.6.0: Remove `daemonize true` from default puma.rb file. Explicitly pass `--daemon` flag when needed.
-- 0.5.1: Added worker_timeout option
-- 0.5.0: Bugs fixes
-- 0.4.2: Fix monit template to support chruby
-- 0.4.1: Fix puma jungle (debian)
-- 0.4.0: Multi-bind support
-- 0.3.7: Dependency bug fix
-- 0.3.5: Fixed a prehistoric bug
-- 0.3.4: I don't remember what i did here
-- 0.3.3: Puma jungle start fix
-- 0.3.2: Tag option support (require puma  2.8.2+)
-- 0.3.1: Typo fix
-- 0.3.0: Initial support for puma signals
-- 0.2.2: Application pre-loading is optional now (set puma_preload_app to false to turn it off)
-- 0.2.1: Tasks are run within rack context
-- 0.2.0: Support for puma `ActiveRecord::Base.establish_connection` on
-  boot
-- 0.1.3: Capistrano 3.1 support
-- 0.1.2: Gemfile are refreshed between deploys now
-- 0.1.1: Initial support for Monit and configuration override added.
-- 0.1.0: Phased restart will be used if puma is in cluster mode
-- 0.0.9: puma.rb location changed to shared_path root. puma:check moved to after deploy:check
-- 0.0.8: puma.rb is automatically generated if not present. Fixed RVM issue.
-- 0.0.7: Gem pushed to rubygems as capistrano3-puma. Support of Redhat based OS for Jungle init script.
-
-
-## Contributors
-
-- [Ruohan Chen](https://github.com/crhan)
-- [molfar](https://github.com/molfar)
-- [ayaya](https://github.com/ayamomiji)
-- [Shane O'Grady](https://github.com/shaneog)
-- [Jun Lin](https://github.com/linjunpop)
-- [fang duan](https://github.com/dfang)
-- [Steve Madere](https://github.com/stevemadere)
-- [Matias De Santi](https://github.com/mdesanti)
+### Other configs
+
+Configurable options, shown here with defaults: Please note the configuration options below are not required unless you are trying to override a default setting, for instance if you are deploying on a host on which you do not have sudo or root privileges and you need to restrict the path. These settings go in the deploy.rb file.
+
+```ruby
+    set :puma_user, fetch(:user)
+    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
+    set :puma_state, "#{shared_path}/tmp/pids/puma.state"
+    set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
+    set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
+    set :puma_default_control_app, "unix://#{shared_path}/tmp/sockets/pumactl.sock"
+    set :puma_conf, "#{shared_path}/puma.rb"
+    set :puma_access_log, "#{shared_path}/log/puma_access.log"
+    set :puma_error_log, "#{shared_path}/log/puma_error.log"
+    set :puma_role, :app
+    set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
+    set :puma_threads, [0, 16]
+    set :puma_workers, 0
+    set :puma_worker_timeout, nil
+    set :puma_init_active_record, false
+    set :puma_preload_app, false
+    set :puma_plugins, []  #accept array of plugins
+    set :nginx_use_ssl, false
+```
 
 ## Contributing
 

data/capistrano3-puma.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files`.split($/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '~> 3.0'
-  spec.add_dependency 'puma' , '>= 2.6'
+  spec.add_dependency 'capistrano', '~> 3.5'
+  spec.add_dependency 'capistrano-bundler'
+  spec.add_dependency 'puma' , '~> 3.4'
 end

data/lib/capistrano/puma.rb

@@ -1 +1,2 @@
+require 'capistrano/bundler'
 load File.expand_path('../tasks/puma.rake', __FILE__)

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '1.2.1'
+    VERSION = '2.0.0'
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -21,14 +21,23 @@ namespace :puma do
     desc 'Monitor Puma monit-service'
     task :monitor do
       on roles(fetch(:puma_role)) do
-        sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{puma_monit_service_name}"
+        begin
+          sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{puma_monit_service_name}"
+        rescue
+          invoke 'puma:monit:config'
+          sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{puma_monit_service_name}"
+        end
       end
     end
 
     desc 'Unmonitor Puma monit-service'
     task :unmonitor do
       on roles(fetch(:puma_role)) do
-        sudo_if_needed "#{fetch(:puma_monit_bin)} unmonitor #{puma_monit_service_name}"
+        begin
+          sudo_if_needed "#{fetch(:puma_monit_bin)} unmonitor #{puma_monit_service_name}"
+        rescue
+          # no worries here (still no monitoring)
+        end
       end
     end
 
@@ -69,4 +78,4 @@ namespace :puma do
     end
 
   end
-end
+end

data/lib/capistrano/tasks/nginx.rake

@@ -1,3 +1,16 @@
+namespace :load do
+  task :defaults do
+    # Nginx and puma configuration
+    set :nginx_config_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
+    set :nginx_sites_available_path, -> { '/etc/nginx/sites-available' }
+    set :nginx_sites_enabled_path, -> { '/etc/nginx/sites-enabled' }
+    set :nginx_server_name, -> { "localhost #{fetch(:application)}.local" }
+    set :nginx_flags, -> { 'fail_timeout=0' }
+    set :nginx_http_flags, -> { fetch(:nginx_flags) }
+    set :nginx_socket_flags, -> { fetch(:nginx_flags) }
+    set :nginx_use_ssl, false
+  end
+end
 namespace :puma do
   desc 'Setup nginx configuration'
   task :nginx_config do

data/lib/capistrano/tasks/puma.rake

@@ -1,4 +1,3 @@
-
 namespace :load do
   task :defaults do
     set :puma_default_hooks, -> { true }
@@ -19,19 +18,13 @@ namespace :load do
     set :puma_init_active_record, false
     set :puma_preload_app, false
 
-    # Rbenv and RVM integration
-    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w{ puma pumactl })
-    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w{ puma pumactl })
+    # Chruby, Rbenv and RVM integration
+    append :chruby_map_bins, 'puma', 'pumactl'
+    append :rbenv_map_bins, 'puma', 'pumactl'
+    append :rvm_map_bins, 'puma', 'pumactl'
 
-    # Nginx and puma configuration
-    set :nginx_config_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
-    set :nginx_sites_available_path, -> { '/etc/nginx/sites-available' }
-    set :nginx_sites_enabled_path, -> { '/etc/nginx/sites-enabled' }
-    set :nginx_server_name, -> { "localhost #{fetch(:application)}.local" }
-    set :nginx_flags, -> { 'fail_timeout=0' }
-    set :nginx_http_flags, -> { fetch(:nginx_flags) }
-    set :nginx_socket_flags, -> { fetch(:nginx_flags) }
-    set :nginx_use_ssl, false
+    # Bundler integration
+    append :bundle_bins, 'puma', 'pumactl'
   end
 end
 
@@ -59,9 +52,14 @@ namespace :puma do
         else
           invoke 'puma:config'
         end
-        within current_path do
-          with rack_env: fetch(:puma_env) do
-            execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)} --daemon"
+
+        if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
+          info 'Already Puma is running'
+        else
+          within current_path do
+            with rack_env: fetch(:puma_env) do
+              execute :puma, "-C #{fetch(:puma_conf)} --daemon"
+            end
           end
         end
       end
@@ -76,8 +74,8 @@ namespace :puma do
           puma_switch_user(role) do
             with rack_env: fetch(:puma_env) do
               if test "[ -f #{fetch(:puma_pid)} ]"
-                if test "kill -0 $( cat #{fetch(:puma_pid)} )"
-                  execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+                if test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
+                  execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
                 else
                   # delete invalid pid file , process is not running.
                   execute :rm, fetch(:puma_pid)
@@ -100,9 +98,9 @@ namespace :puma do
         within current_path do
           puma_switch_user(role) do
             with rack_env: fetch(:puma_env) do
-              if test "[ -f #{fetch(:puma_pid)} ]" and test "kill -0 $( cat #{fetch(:puma_pid)} )"
+              if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
                 # NOTE pid exist but state file is nonsense, so ignore that case
-                execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+                execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
               else
                 # Puma is not running or state file is not present : Run it
                 invoke 'puma:start'
@@ -149,6 +147,7 @@ namespace :puma do
   def puma_user(role)
     properties = role.properties
     properties.fetch(:puma_user) ||               # local property for puma only
+    fetch(:puma_user) ||
     properties.fetch(:run_as) || # global property across multiple capistrano gems
     role.user
   end
@@ -167,6 +166,12 @@ namespace :puma do
     end.join("\n")
   end
 
+  def puma_plugins
+    Array(fetch(:puma_plugins)).collect do |bind|
+      "plugin '#{bind}'"
+    end.join("\n")
+  end
+
   def template_puma(from, to, role)
     [
         "lib/capistrano/templates/#{from}-#{role.hostname}-#{fetch(:stage)}.rb",
@@ -183,7 +188,7 @@ namespace :puma do
     ].each do |path|
       if File.file?(path)
         erb = File.read(path)
-        upload! StringIO.new(ERB.new(erb).result(binding)), to
+        upload! StringIO.new(ERB.new(erb, nil, '-').result(binding)), to
         break
       end
     end

data/lib/capistrano/tasks/workers.rake

@@ -7,7 +7,7 @@ namespace :puma do
         #TODO
         # cleanup
         # add host name/ip
-        workers_count = capture("ps ax | grep -c 'puma: cluster worker: `cat  #{fetch(:puma_pid)}`'").to_i - 1
+        workers_count = capture("ps ax | grep -c 'puma: cluster worker [0-9]: `cat  #{fetch(:puma_pid)}`'").to_i - 1
         log  "Workers count : #{workers_count}"
         end
       end
@@ -21,7 +21,7 @@ namespace :puma do
     task :more do
       on roles (fetch(:puma_role)) do |role|
         puma_switch_user(role) do
-          execute("kill -TTIN `cat  #{fetch(:puma_pid)}`")
+          execute(:kill, "-TTIN `cat  #{fetch(:puma_pid)}`")
         end
       end
     end
@@ -30,7 +30,7 @@ namespace :puma do
     task :less do
       on roles (fetch(:puma_role)) do |role|
         puma_switch_user(role) do
-          execute("kill -TTOU `cat  #{fetch(:puma_pid)}`")
+          execute(:kill, "-TTOU `cat  #{fetch(:puma_pid)}`")
         end
       end
     end

data/lib/capistrano/templates/nginx_conf.erb

@@ -1,32 +1,35 @@
 upstream puma_<%= fetch(:nginx_config_name) %> { <%
-  flags = 'fail_timeout=0'
   @backends = [fetch(:puma_bind)].flatten.map do |m|
   etype, address  = /(tcp|unix|ssl):\/{1,2}(.+)/.match(m).captures
-  if etype =='unix'
+  if etype == 'unix'
     "server #{etype}:#{address} #{fetch(:nginx_socket_flags)};"
   else
     "server #{address.gsub(/0\.0\.0\.0(.+)/, "127.0.0.1\\1")} #{fetch(:nginx_http_flags)};"
   end
 end
-%><% @backends.each do |server|  %>
+%><% @backends.each do |server| %>
   <%= server %><% end %>
 }
-<% if fetch(:nginx_use_ssl) %>
+<% if fetch(:nginx_use_ssl) -%>
 server {
   listen 80;
+  server_name <%= fetch(:nginx_server_name) %>;
   rewrite ^(.*) https://$host$1 permanent;
 }
-<% end %>
+<% end -%>
 
 server {
-<% if fetch(:nginx_use_ssl) %>
+<% if fetch(:nginx_use_ssl) -%>
   listen 443;
   ssl on;
   ssl_certificate /etc/ssl/certs/<%= fetch(:nginx_config_name) %>.crt;
   ssl_certificate_key /etc/ssl/private/<%= fetch(:nginx_config_name) %>.key;
-<% else %>
+<% else -%>
   listen 80;
-<% end %>
+<% end -%>
+  server_name <%= fetch(:nginx_server_name) %>;
+  root <%= current_path %>/public;
+  try_files $uri/index.html $uri @puma_<%= fetch(:nginx_config_name) %>;
 
   client_max_body_size 4G;
   keepalive_timeout 10;
@@ -34,17 +37,13 @@ server {
   error_page 500 502 504 /500.html;
   error_page 503 @503;
 
-  server_name <%= fetch(:nginx_server_name) %>;
-  root <%= current_path %>/public;
-  try_files $uri/index.html $uri @puma_<%= fetch(:nginx_config_name) %>;
-
   location @puma_<%= fetch(:nginx_config_name) %> {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-<% if fetch(:nginx_use_ssl) %>
+<% if fetch(:nginx_use_ssl) -%>
     proxy_set_header X-Forwarded-Proto https;
-<% end %>
+<% end -%>
     proxy_pass http://puma_<%= fetch(:nginx_config_name) %>;
     # limit_req zone=one;
     access_log <%= shared_path %>/log/nginx.access.log;
@@ -80,8 +79,4 @@ server {
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }
-
-  location ~ \.(php|html)$ {
-    return 405;
-  }
 }

data/lib/capistrano/templates/puma.rb.erb

@@ -13,6 +13,8 @@ stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', t
 
 threads <%=fetch(:puma_threads).join(',')%>
 
+<%= puma_plugins %>
+
 <%= puma_bind %>
 <% if fetch(:puma_control_app) %>
 activate_control_app "<%= fetch(:puma_default_control_app) %>"
@@ -34,6 +36,10 @@ on_restart do
 end
 
 <% if puma_preload_app? and fetch(:puma_init_active_record) %>
+before_fork do
+  ActiveRecord::Base.connection_pool.disconnect!
+end
+
 on_worker_boot do
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Base.establish_connection

data/lib/capistrano/templates/puma_monit.conf.erb

@@ -3,5 +3,5 @@
 #
 check process <%= puma_monit_service_name %>
   with pidfile "<%= fetch(:puma_pid) %>"
-  start program = "/usr/bin/sudo -u <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec puma -C <%= fetch(:puma_conf) %> --daemon'"
-  stop program = "/usr/bin/sudo -u <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec pumactl -S <%= fetch(:puma_state) %> stop'"
+  start program = "/usr/bin/sudo -iu <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:puma] %> -C <%= fetch(:puma_conf) %> --daemon'"
+  stop program = "/usr/bin/sudo -iu <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:pumactl] %> -S <%= fetch(:puma_state) %> stop'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Puma integration for Capistrano 3
 email:
 - Terminale@gmail.com
@@ -46,6 +60,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
+- CONTRIBUTORS.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,9 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano
 test_files: []
-has_rdoc: