From 06c1d3b41fdace46fe2aba08ba3e470245c036b8 Mon Sep 17 00:00:00 2001
From: Arie <git@ariekanarie.nl>
Date: Wed, 20 Jul 2022 22:51:25 +0200
Subject: [PATCH] Upgrade sidekiq and puma and switch to systemd instead of
 daemons

---
 Capfile      |  4 +++-
 Gemfile      |  4 ++--
 Gemfile.lock | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Capfile b/Capfile
index 3226569a4..a0f5b8b8a 100644
--- a/Capfile
+++ b/Capfile
@@ -16,8 +16,10 @@ require 'capistrano/faster_assets'
 
 require 'capistrano/puma'
 install_plugin Capistrano::Puma
-install_plugin Capistrano::Puma::Workers
+install_plugin Capistrano::Puma::Systemd
 require 'capistrano/sidekiq'
+install_plugin Capistrano::Sidekiq
+install_plugin Capistrano::Sidekiq::Systemd
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Gemfile b/Gemfile
index 6a82d9df7..a7a7ffb0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem 'rubyzip', require: 'zip'
 gem 'sass'
 gem 'sassc'
 gem 'sass-rails'
-gem 'sidekiq', '< 6'
+gem 'sidekiq'
 gem 'sidekiq-cron'
 gem 'simple_form'
 gem 'sprockets'
@@ -74,7 +74,7 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'capistrano', require: false
-  gem 'capistrano3-puma', '~> 4.0', require: false
+  gem 'capistrano3-puma', '~> 5.0', require: false
   gem 'capistrano-bundler', require: false
   gem 'capistrano_colors', require: false
   gem 'capistrano-ext', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bd0a2216b..23588b2dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,13 +130,14 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano-sidekiq (1.0.3)
+    capistrano-sidekiq (2.3.0)
       capistrano (>= 3.9.0)
-      sidekiq (>= 3.4, < 6.0)
-    capistrano3-puma (4.0.0)
+      capistrano-bundler
+      sidekiq (>= 6.0)
+    capistrano3-puma (5.2.0)
       capistrano (~> 3.7)
       capistrano-bundler
-      puma (~> 4.0)
+      puma (>= 4.0, < 6.0)
     capistrano_colors (0.5.5)
     capybara (3.37.1)
       addressable
@@ -431,7 +432,7 @@ GEM
     pry-nav (1.0.0)
       pry (>= 0.9.10, < 0.15)
     public_suffix (4.0.7)
-    puma (4.3.12)
+    puma (5.6.4)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.6.0)
@@ -481,7 +482,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbzip2 (0.3.0)
-    redis (4.5.1)
+    redis (4.7.1)
     redis-actionpack (5.3.0)
       actionpack (>= 5, < 8)
       redis-rack (>= 2.1.0, < 3)
@@ -573,11 +574,10 @@ GEM
       faraday (>= 1.0)
     shoulda-matchers (5.1.0)
       activesupport (>= 5.2.0)
-    sidekiq (5.2.10)
-      connection_pool (~> 2.2, >= 2.2.2)
+    sidekiq (6.5.1)
+      connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 4.5, < 4.6.0)
+      redis (>= 4.2.0)
     sidekiq-cron (1.6.0)
       fugit (~> 1)
       sidekiq (>= 4.2.1)
@@ -687,7 +687,7 @@ DEPENDENCIES
   capistrano-rails
   capistrano-rvm
   capistrano-sidekiq
-  capistrano3-puma (~> 4.0)
+  capistrano3-puma (~> 5.0)
   capistrano_colors
   capybara
   carrierwave
@@ -763,7 +763,7 @@ DEPENDENCIES
   sassc
   sentry-raven
   shoulda-matchers
-  sidekiq (< 6)
+  sidekiq
   sidekiq-cron
   simple_form
   solargraph