capistrano3-puma 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2556d3d0f9c69518e9b8fff34c4e9a5414df32421c886749c5780ea76d4a29ab
-  data.tar.gz: 346d5440671df45a98bb55b9156de333b6d75978c8370f323b8e191f87f5e84c
+  metadata.gz: 73044aaf982d12bacb545460eec4a28a80735dfda025df5ee6a7b656f63185a1
+  data.tar.gz: 768c19108f85c471feb7cfc341e04244af87c90ed91e59c13d44f7771269ca4a
 SHA512:
-  metadata.gz: e223d91b3153aa0cd69ffb59ffa21f3ac4d49c98f006825930ad4ea385c6d89e79d61d2478af3314e583abcfc596dcef180fed80b7d2f6f7c5fa93f2169a76c1
-  data.tar.gz: 6f1db9884b136d4595e65f7dc2bc7eb3027e8603e74e3f985b014a912ee8729c83b223a118ea37b39aa3981a82cead762fc26c959b4b171132624708400709f6
+  metadata.gz: 725fa2b8f4686d644a3068d872b46b17f3f1e3e772f3efb63bcec68affbc793dc3e037220bf3c27bad86a4c8c71f492d140b51e4f6388cbd741762c4461764b8
+  data.tar.gz: '03186b58d6b3574bb67ebd393827704bb69f2bf90a60412ba16ae9067f4a1c91b8d5150f95143bb1525df78417ab9e3b372e8d129f11b56b2a9498446c71a15e'

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 ## Changelog
+- 5.0.3:
+  - Remove ExecStop from systemd unit file (#314)
+  - Systemd user service manager and lingering (#307)
+- 5.0.2:  
+  - Single name for systemd config template
+- 5.0.1:
+  - Fix #301, Task "puma:smart_restart" not found
 - 5.0.0:
   - Support puma 5.0
   - Support SystemD service manager

data/README.md

@@ -116,6 +116,18 @@ To generate unit file use:
 cap production puma:systemd:config puma:systemd:enable
 ```
 
+To use customize environment variables
+
+```ruby
+  set :puma_service_unit_env_file, '/etc/environment'
+```
+```ruby
+  set :puma_service_unit_env_vars, %w[
+      RAILSE_NV=development
+      PUMA_METRICS_HTTP=tcp://0.0.0.0:9393
+  ]
+```
+
 ### Multi bind
 
 Multi-bind can be set with an array in the puma_bind variable
@@ -158,6 +170,9 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_plugins, []  #accept array of plugins
     set :puma_tag, fetch(:application)
     set :puma_restart_command, 'bundle exec puma'
+    set :puma_service_unit_name, "puma_#{fetch(:application)}_#{fetch(:stage)}"
+    set :puma_service_unit_env_file, nil
+    set :puma_service_unit_env_vars, []
 
     set :nginx_config_name, "#{fetch(:application)}_#{fetch(:stage)}"
     set :nginx_flags, 'fail_timeout=0'

data/lib/capistrano/puma/systemd.rb

@@ -11,9 +11,10 @@ module Capistrano
     end
 
     def set_defaults
-      set_if_empty :puma_systemd_conf_dir, '/etc/systemd/system'
       set_if_empty :puma_systemctl_bin, '/bin/systemctl'
-      set_if_empty :puma_service_unit_name, 'puma'
+      set_if_empty :puma_service_unit_name, -> { "puma_#{fetch(:application)}_#{fetch(:stage)}" }
+      set_if_empty :puma_service_unit_user, :system
+      set_if_empty :puma_enable_lingering, false
     end
   end
 end

data/lib/capistrano/puma/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  PUMAVERSION = '5.0.2'
+  PUMAVERSION = '5.0.3'
 end

data/lib/capistrano/tasks/systemd.rake

@@ -8,52 +8,95 @@ namespace :puma do
     task :config do
       on roles(fetch(:puma_role)) do |role|
         unit_filename = "#{fetch(:puma_service_unit_name)}.service"
-        git_plugin.template_puma 'puma.service', "#{fetch(:tmp_dir)}/#{unit_filename}", role
-        sudo "mv #{fetch(:tmp_dir)}/#{unit_filename} #{fetch(:puma_systemd_conf_dir)}"
-        sudo "#{fetch(:puma_systemctl_bin)} daemon-reload"
+        git_plugin.template_puma "puma.service", "#{fetch(:tmp_dir)}/#{unit_filename}", role
+        systemd_path = fetch(:puma_systemd_conf_dir, git_plugin.fetch_systemd_unit_path)
+        if fetch(:puma_systemctl_user) == :system
+          sudo "mv #{fetch(:tmp_dir)}/#{unit_filename} #{systemd_path}"
+          sudo "#{fetch(:puma_systemctl_bin)} daemon-reload"
+        else
+          execute :mkdir, "-p", systemd_path
+          execute :mv, "#{fetch(:tmp_dir)}/#{unit_filename}", "#{systemd_path}"
+          execute fetch(:puma_systemctl_bin), "--user", "daemon-reload"
+        end
       end
     end
 
     desc 'Enable Puma systemd service'
     task :enable do
       on roles(fetch(:puma_role)) do
-        sudo "#{fetch(:puma_systemctl_bin)} enable #{fetch(:puma_service_unit_name)}"
+        if fetch(:puma_systemctl_user) == :system
+          sudo "#{fetch(:puma_systemctl_bin)} enable #{fetch(:puma_service_unit_name)}"
+        else
+          execute "#{fetch(:puma_systemctl_bin)}", "--user", "enable", fetch(:puma_service_unit_name)
+          execute :loginctl, "enable-linger", fetch(:puma_lingering_user) if fetch(:puma_enable_lingering)
+        end
       end
     end
 
     desc 'Disable Puma systemd service'
     task :disable do
       on roles(fetch(:puma_role)) do
-        sudo "#{fetch(:puma_systemctl_bin)} disable #{fetch(:puma_service_unit_name)}"
+        if fetch(:puma_systemctl_user) == :system
+          sudo "#{fetch(:puma_systemctl_bin)} disable #{fetch(:puma_service_unit_name)}"
+        else
+          execute "#{fetch(:puma_systemctl_bin)}", "--user", "disable", fetch(:puma_service_unit_name)
+        end
       end
     end
+
   end
 
   desc 'Start Puma service via systemd'
   task :start do
     on roles(fetch(:puma_role)) do
-      sudo "#{fetch(:puma_systemctl_bin)} start #{fetch(:puma_service_unit_name)}"
+      if fetch(:puma_systemctl_user) == :system
+        sudo "#{fetch(:puma_systemctl_bin)} start #{fetch(:puma_service_unit_name)}"
+      else
+        execute "#{fetch(:puma_systemctl_bin)}", "--user", "start", fetch(:puma_service_unit_name)
+      end
     end
   end
 
   desc 'Stop Puma service via systemd'
   task :stop do
     on roles(fetch(:puma_role)) do
-      sudo "#{fetch(:puma_systemctl_bin)} stop #{fetch(:puma_service_unit_name)}"
+      if fetch(:puma_systemctl_user) == :system
+        sudo "#{fetch(:puma_systemctl_bin)} stop #{fetch(:puma_service_unit_name)}"
+      else
+        execute "#{fetch(:puma_systemctl_bin)}", "--user", "stop", fetch(:puma_service_unit_name)
+      end
     end
   end
 
   desc 'Restart Puma service via systemd'
   task :restart do
     on roles(fetch(:puma_role)) do
-      sudo "#{fetch(:puma_systemctl_bin)} restart #{fetch(:puma_service_unit_name)}"
+      if fetch(:puma_systemctl_user) == :system
+        sudo "#{fetch(:puma_systemctl_bin)} restart #{fetch(:puma_service_unit_name)}"
+      else
+        execute "#{fetch(:puma_systemctl_bin)}", "--user", "restart", fetch(:puma_service_unit_name)
+      end
     end
   end
 
   desc 'Get Puma service status via systemd'
   task :status do
     on roles(fetch(:puma_role)) do
-      sudo "#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)}"
+      if fetch(:puma_systemctl_user) == :system
+        sudo "#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)}"
+      else
+        execute "#{fetch(:puma_systemctl_bin)}", "--user", "status", fetch(:puma_service_unit_name)
+      end
     end
   end
+
+  def fetch_systemd_unit_path
+    if fetch(:puma_systemctl_user) == :system
+      "/etc/systemd/system/"
+    else
+      home_dir = backend.capture :pwd
+      File.join(home_dir, ".config", "systemd", "user")
+    end
+  end
+
 end

data/lib/capistrano/templates/nginx_conf.erb

@@ -51,6 +51,7 @@ server {
   location @puma_<%= fetch(:nginx_config_name) %> {
     proxy_http_version 1.1;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header Host $host;
     proxy_redirect off;
     proxy_set_header Upgrade $http_upgrade;

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

@@ -4,15 +4,22 @@ After=network.target
 
 [Service]
 Type=simple
-User=<%= puma_user(@role) %>
+<%="User=#{puma_user(@role)}" if fetch(:puma_systemctl_user) == :system %>
 WorkingDirectory=<%= current_path %>
 ExecStart=<%= SSHKit.config.command_map[:bundle] %> exec puma -C <%= fetch(:puma_conf) %>
 ExecReload=/bin/kill -TSTP $MAINPID
-ExecStop=/bin/kill -TERM $MAINPID
 StandardOutput=append:<%= fetch(:puma_access_log) %>
 StandardError=append:<%= fetch(:puma_error_log) %>
+<%="EnvironmentFile=#{fetch(:puma_service_unit_env_file)}" if fetch(:puma_service_unit_env_file) %>
+
+<% fetch(:puma_service_unit_env_vars, []).each do |environment_variable| %>
+<%="Environment=#{environment_variable}" %>
+<% end %>
 
 Restart=always
+RestartSec=1
+
+SyslogIdentifier=puma
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=<%=(fetch(:puma_systemctl_user) == :system) ? "multi-user.target" : "default.target"%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano