consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6022 from consuldemocracy/dependabot/bundler/capistrano3-puma-6.2.0

Browse Source 
Bump capistrano3-puma from 6.0.0 to 6.2.0
This commit is contained in:
Sebastia
2025-08-04 16:22:05 +02:00
committed by GitHub
parent 3504d9aeac a9ba7425bf
commit c7a2389d6b
4 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -91,7 +91,7 @@ group :development do
gem "capistrano-npm", "~> 1.0.3", require: false
gem "capistrano-rails", "~> 1.7.0", require: false
gem "capistrano3-delayed-job", "~> 1.7.6"
gem "capistrano3-puma", "~> 6.0.0"
gem "capistrano3-puma", "~> 6.2.0"
gem "erb_lint", "~> 0.9.0", require: false
gem "faraday-retry", "~> 2.3.1", require: false
gem "htmlbeautifier", "~> 1.4.3", require: false

6
Gemfile.lock
View File

@@ -139,7 +139,7 @@ GEM
capistrano3-delayed-job (1.7.6)
capistrano (~> 3.0, >= 3.0.0)
daemons (~> 1.3)
capistrano3-puma (6.0.0)
capistrano3-puma (6.2.0)
capistrano (~> 3.7)
capistrano-bundler
puma (>= 5.1, < 7.0)
@@ -447,7 +447,7 @@ GEM
omniauth-oauth (~> 1.1)
rack
orm_adapter (0.5.0)
ostruct (0.6.1)
ostruct (0.6.2)
parallel (1.27.0)
paranoia (3.0.1)
activerecord (>= 6, < 8.1)
@@ -763,7 +763,7 @@ DEPENDENCIES
capistrano-npm (~> 1.0.3)
capistrano-rails (~> 1.7.0)
capistrano3-delayed-job (~> 1.7.6)
capistrano3-puma (~> 6.0.0)
capistrano3-puma (~> 6.2.0)
capybara (~> 3.40.0)
capybara-webmock (~> 0.7.0)
caxlsx (~> 4.2.0)

2
config/deploy.rb
View File

@@ -53,9 +53,9 @@ set :puma_systemctl_user, :user
set :puma_enable_socket_service, true
set :puma_service_unit_env_vars, ["EXECJS_RUNTIME=Disabled"]
set :puma_service_unit_name, -> { "puma_#{fetch(:application)}_#{fetch(:stage)}" }
set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"
set :puma_access_log, -> { File.join(shared_path, "log", "puma_access.log") }
set :puma_error_log, -> { File.join(shared_path, "log", "puma_error.log") }
set :puma_systemd_watchdog_sec, 0
set :delayed_job_workers, 2
set :delayed_job_roles, :background

40
lib/capistrano/templates/puma.service.erb
View File

@@ -1,40 +0,0 @@
# This file tells systemd how to run Puma as a 24/7 long-running daemon.
#
# Customize this file based on your bundler location, app directory, etc.
# Customize and copy this into /usr/lib/systemd/system (CentOS) or /lib/systemd/system (Ubuntu).
# Then run:
# - systemctl enable <%= fetch(:puma_service_unit_name) %>
# - systemctl {start,stop,restart} <%= fetch(:puma_service_unit_name) %>
#
#
# Use `journalctl -u <%= fetch(:puma_service_unit_name) %> -rn 100` to view the last 100 lines of log output.
#
[Unit]
Description=Puma HTTP Server for <%= "#{fetch(:application)} (#{fetch(:stage)})" %>
<%= "Requires=#{fetch(:puma_service_unit_name)}.socket" if fetch(:puma_enable_socket_service) %>
After=network.target
[Service]
Type=<%= service_unit_type %>
WatchdogSec=0
<%="User=#{puma_user(@role)}" if fetch(:puma_systemctl_user) == :system %>
WorkingDirectory=<%= current_path %>
ExecStart=<%= expanded_bundle_command %> exec puma -e <%= fetch(:puma_env) %>
ExecReload=/bin/kill -USR1 $MAINPID
<%- Array(fetch(:puma_service_unit_env_files)).each do |file| %>
<%="EnvironmentFile=#{file}" -%>
<% end -%>
<% Array(fetch(:puma_service_unit_env_vars)).each do |environment_variable| %>
<%="Environment=\"#{environment_variable}\"" -%>
<% end -%>
# if we crash, restart
RestartSec=1
Restart=on-failure
<%="StandardOutput=append:#{fetch(:puma_access_log)}" if fetch(:puma_access_log) %>
<%="StandardError=append:#{fetch(:puma_error_log)}" if fetch(:puma_error_log) %>
SyslogIdentifier=puma
[Install]
WantedBy=<%=(fetch(:puma_systemctl_user) == :system) ? "multi-user.target" : "default.target"%>