From c373104393ebf4b9d004da00f36e30a54bb906e2 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Wed, 30 Mar 2022 21:09:53 +0300
Subject: [PATCH] back to puma

---
 Gemfile          |  3 ++-
 Gemfile.lock     | 11 +++++++----
 config/deploy.rb |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 350463d..c37d19a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "net-ssh"
 gem "haml-rails"
 gem 'high_voltage', '~> 3.1'
 
-gem "passenger", require: "phusion_passenger/rack_handler"
+gem "puma"
 
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 # gem "image_processing", "~> 1.2"
@@ -30,6 +30,7 @@ group :development do
   gem "web-console"
   gem "rack-mini-profiler"
   gem "mina"
+  gem "mina-puma"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index dadb919..0e0bdf2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,6 +128,9 @@ GEM
     mina (1.2.4)
       open4 (~> 1.3.4)
       rake
+    mina-puma (1.1.0)
+      mina (~> 1.2.0)
+      puma (>= 2.13)
     mini_mime (1.1.2)
     minitest (5.15.0)
     msgpack (1.4.5)
@@ -151,10 +154,9 @@ GEM
     nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     open4 (1.3.4)
-    passenger (6.0.13)
-      rack
-      rake (>= 0.8.1)
     public_suffix (4.0.6)
+    puma (5.6.4)
+      nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
     rack-mini-profiler (3.0.0)
@@ -252,8 +254,9 @@ DEPENDENCIES
   high_voltage (~> 3.1)
   importmap-rails
   mina
+  mina-puma
   net-ssh
-  passenger
+  puma
   rack-mini-profiler
   rails (~> 7.0)
   sassc-rails
diff --git a/config/deploy.rb b/config/deploy.rb
index 41cc3ca..60ddfda 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,7 @@
 require 'mina/rails'
 require 'mina/git'
 require 'mina/rbenv'  # for rbenv support. (https://rbenv.org)
+require 'mina/puma'
 
 # Basic settings:
 #   domain       - The hostname to SSH to.
@@ -58,8 +59,7 @@ task :deploy do
 
     on :launch do
       in_path(fetch(:current_path)) do
-        command %{mkdir -p tmp/}
-        command %{touch tmp/restart.txt}
+        invoke :'puma:phased_restart'
       end
     end
   end