capistrano3-puma 5.2.0 → 6.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e0fb64cfd73c2183c8ac641ec0e426f1721657254eeae1b6cebea4d9b34e78
-  data.tar.gz: 658219686493acef08d13c050c6d3c8536c980a6820d3d1165dcb5c3e3c80f89
+  metadata.gz: 8d2f6376b7e7c2838e8d06d7acb249e7b4cca75982bd440e2ad8952f80941132
+  data.tar.gz: 24ca957bc88c4f06d7a11dea7c70b72f77ca275bc46a77b6eb44f98bc51b5a3e
 SHA512:
-  metadata.gz: 2423e9acfe501fe4404592ae5099e619aa168e055372ea7e56762a001e59cbefbdf6d32373e7c003a6abe2fefcde429887bddb5d02d7806b8969fa92297d70ad
-  data.tar.gz: f629c899266cbc6a97b40243c1edfdfa7ba23e6f519f837e6c05209de2845261ca25a823a84ecbf1045fe8566845deff8fb71c7fee967e1c9b46d67896f9652b
+  metadata.gz: e0d445a032ad196fd65b8aa863c1fb049aec6f9e8f47f22cd2d05993555c354e110bfb397d1a001b6ee0b3cb9b19e38c3d6fe76bba47d5682b17992910a5717c
+  data.tar.gz: 9bba6960b9246b4877b02baa6339baf7a940caf16bcf54be2c0148850f96b7af1e68a07a97d03ac07bbc978275e1ea6ca44812587da942e176b674d230d2a88c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+[Unreleased](https://github.com/seuros/capistrano-puma/compare/v5.2.0...master)
+- Removed support for support for monit and upstart. (will add them back if someone is willing to maintain them)
+- Sync configuration with capistrano-sidekiq
+- Support for notify systemd service. Add sd_notify gem to your Gemfile.
+- Add example application for easier testing.
+- Deprecate Nginx support. (configuration tools should be preferred over capistrano tasks)
+
 ## [5.2.0](https://github.com/seuros/capistrano-puma/tree/5.2.0) (2021-09-11)
 
 [Full Changelog](https://github.com/seuros/capistrano-puma/compare/v5.1.1...5.2.0)

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Abdelkader Boudih
+Copyright (c) 2013-2022 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

@@ -21,27 +21,14 @@ And then execute:
 
     require 'capistrano/puma'
     install_plugin Capistrano::Puma  # Default puma tasks
-    install_plugin Capistrano::Puma::Workers  # if you want to control the workers (in cluster mode)
-    install_plugin Capistrano::Puma::Jungle # if you need the jungle tasks
-    install_plugin Capistrano::Puma::Monit  # if you need the monit tasks
-    install_plugin Capistrano::Puma::Nginx  # if you want to upload a nginx site template
-```
-You will need to select your service manager
-```ruby
-install_plugin Capistrano::Puma::Daemon  # If you using puma daemonized (not supported in Puma 5+)
-```
-or
-```ruby
-install_plugin Capistrano::Puma::Systemd  # if you use SystemD
+    install_plugin Capistrano::Puma::Systemd
 ```
 
 To prevent loading the hooks of the plugin, add false to the load_hooks param.
 ```ruby
     # Capfile
 
-    require 'capistrano/puma'
     install_plugin Capistrano::Puma, load_hooks: false  # Default puma tasks without hooks
-    install_plugin Capistrano::Puma::Monit, load_hooks: false  # Monit tasks without hooks
 ```
 
 To make it work with rvm, rbenv and chruby, install the plugin after corresponding library inclusion.
@@ -55,84 +42,12 @@ To make it work with rvm, rbenv and chruby, install the plugin after correspondi
 
 ### Config
 
-To list available tasks use `cap -T`
-
-To upload puma config use:
-```ruby
-cap production puma:config
-```
-By default the file located in  `shared/puma.rb`
-
-
-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 production puma:nginx_config
-```
-
-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:
-```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:
-```ruby
-set :puma_nginx, :foo
-```
-or define a standalone one:
-```ruby
-role :puma_nginx, %w{root@example.com}
-```
-
-### Jungle
+Puma configuration is expected to be in `config/puma.rb` or `config/puma/#{fetch(:puma_env)}.rb` and checked in your repository.
+Uploading the configuration via capistrano was removed as it was causing problems with custom configurations.
 
-For Jungle tasks (beta), these options exist:
-```ruby
-    set :puma_jungle_conf, '/etc/puma.conf'
-    set :puma_run_path, '/usr/local/bin/run-puma'
-```
-
-### Systemd
-
-Install Systemd plugin in `Capfile`:
-```ruby
-install_plugin Capistrano::Puma
-install_plugin Capistrano::Puma::Systemd
-```
-
-To generate unit file use:
-```
-cap production puma:systemd:config puma:systemd:enable
-```
+## Example
 
-To use customize environment variables
-
-```ruby
-  set :puma_service_unit_env_file, '/etc/environment'
-```
-```ruby
-  set :puma_service_unit_env_vars, %w[
-      RAILS_ENV=development
-      PUMA_METRICS_HTTP=tcp://0.0.0.0:9393
-  ]
-```
-
-To use [phased restart](https://github.com/puma/puma/blob/master/docs/restart.md) for zero downtime deployments:
-
-```ruby
-  set :puma_phased_restart, true
-```
+A sample application is provided to show how to use this gem at https://github.com/seuros/capistrano-example-app
 
 ### Systemd Socket Activation
 
@@ -150,68 +65,15 @@ cap puma:systemd:restart_socket
 ```
 This would also restart the puma instance as the puma service depends on the socket service being active
 
-### 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)
-```
-    * Listening on tcp://0.0.0.0:9292
-    * Listening on unix:///tmp/puma.sock
-
-### Active Record
-
-For ActiveRecord the following line to your deploy.rb
-```ruby
-    set :puma_init_active_record, true
-```
-
 ### 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_control_app, false
-    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_daemonize, false
-    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_systemctl_user, :system # accepts :user
-    set :puma_enable_lingering, fetch(:puma_systemctl_user) != :system # https://wiki.archlinux.org/index.php/systemd/User#Automatic_start-up_of_systemd_user_instances
-    set :puma_lingering_user, fetch(:user)
-    set :puma_service_unit_env_file, nil
+    set :puma_role, :web
+    set :puma_service_unit_env_files, []
     set :puma_service_unit_env_vars, []
-    set :puma_phased_restart, false
-
-    set :nginx_config_name, "#{fetch(:application)}_#{fetch(:stage)}"
-    set :nginx_flags, 'fail_timeout=0'
-    set :nginx_http_flags, fetch(:nginx_flags)
-    set :nginx_server_name, "localhost #{fetch(:application)}.local"
-    set :nginx_sites_available_path, '/etc/nginx/sites-available'
-    set :nginx_sites_enabled_path, '/etc/nginx/sites-enabled'
-    set :nginx_socket_flags, fetch(:nginx_flags)
-    set :nginx_ssl_certificate, "/etc/ssl/certs/#{fetch(:nginx_config_name)}.crt"
-    set :nginx_ssl_certificate_key, "/etc/ssl/private/#{fetch(:nginx_config_name)}.key"
-    set :nginx_use_ssl, false
-    set :nginx_use_http2, true
-    set :nginx_downstream_uses_ssl, false
 ```
 
 __Notes:__ If you are setting values for variables that might be used by other plugins, use `append` instead of `set`. For example:
@@ -219,6 +81,9 @@ __Notes:__ If you are setting values for variables that might be used by other p
 append :rbenv_map_bins, 'puma', 'pumactl'
 ```
 
+# Nginx documentation
+Nginx documentation was moved to [nginx.md](docs/nginx.md)
+
 ## Contributing
 
 1. Fork it

data/lib/capistrano/puma/systemd.rb

@@ -11,13 +11,18 @@ module Capistrano
     end
 
     def set_defaults
-      set_if_empty :puma_systemctl_bin, '/bin/systemctl'
-      set_if_empty :puma_service_unit_name, -> { "puma_#{fetch(:application)}_#{fetch(:stage)}" }
-      set_if_empty :puma_enable_socket_service, -> { false }
-      set_if_empty :puma_systemctl_user, :system
+      set_if_empty :puma_systemctl_bin, -> { fetch(:systemctl_bin, '/bin/systemctl') }
+      set_if_empty :puma_service_unit_name, -> { "#{fetch(:application)}_puma_#{fetch(:stage)}" }
+      set_if_empty :puma_enable_socket_service, false
+
+      set_if_empty :puma_service_unit_env_files, -> { fetch(:service_unit_env_files, []) }
+      set_if_empty :puma_service_unit_env_vars, -> { fetch(:service_unit_env_vars, []) }
+
+      set_if_empty :puma_systemctl_user, -> { fetch(:systemctl_user, :user) }
       set_if_empty :puma_enable_lingering, -> { fetch(:puma_systemctl_user) != :system }
-      set_if_empty :puma_lingering_user, -> { fetch(:user) }
-      set_if_empty :puma_phased_restart, -> { false }
+      set_if_empty :puma_lingering_user, -> { fetch(:lingering_user, fetch(:user)) }
+
+      set_if_empty :puma_service_templates_path, fetch(:service_templates_path, 'config/deploy/templates')
     end
 
     def expanded_bundle_command

data/lib/capistrano/puma.rb

@@ -28,6 +28,15 @@ module Capistrano
       end.join("\n")
     end
 
+    def service_unit_type
+      ## Jruby don't support notify
+      return "simple" if RUBY_ENGINE == "jruby"
+      fetch(:puma_service_unit_type,
+      ## Check if sd_notify is available in the bundle
+        Gem::Specification.find_all_by_name("sd_notify").any? ? "notify" : "simple")
+
+    end
+
     def compiled_template_puma(from, role)
       @role = role
       file = [
@@ -44,7 +53,7 @@ module Capistrano
           File.expand_path("../templates/#{from}.rb.erb", __FILE__)
       ].detect { |path| File.file?(path) }
       erb = File.read(file)
-      StringIO.new(ERB.new(erb, nil, '-').result(binding))
+      StringIO.new(ERB.new(erb, trim_mode: '-').result(binding))
     end
 
     def template_puma(from, to, role)
@@ -94,72 +103,21 @@ module Capistrano
   class Puma < Capistrano::Plugin
     include PumaCommon
 
-    def define_tasks
-      eval_rakefile File.expand_path('../tasks/puma.rake', __FILE__)
-    end
-
     def set_defaults
-      set_if_empty :puma_role, :app
+      set_if_empty :puma_role, :web
       set_if_empty :puma_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
-      # Configure "min" to be the minimum number of threads to use to answer
-      # requests and "max" the maximum.
-      set_if_empty :puma_threads, [0, 16]
-      set_if_empty :puma_workers, 0
-      set_if_empty :puma_rackup, -> { File.join(current_path, 'config.ru') }
-      set_if_empty :puma_state, -> { File.join(shared_path, 'tmp', 'pids', 'puma.state') }
-      set_if_empty :puma_pid, -> { File.join(shared_path, 'tmp', 'pids', 'puma.pid') }
-      set_if_empty :puma_bind, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'puma.sock') }
-      set_if_empty :puma_control_app, false
-      set_if_empty :puma_default_control_app, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'pumactl.sock') }
-      set_if_empty :puma_conf, -> { File.join(shared_path, 'puma.rb') }
-      set_if_empty :puma_access_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
-      set_if_empty :puma_error_log, -> { File.join(shared_path, 'log', 'puma_error.log') }
-      set_if_empty :puma_init_active_record, false
-      set_if_empty :puma_preload_app, false
-      set_if_empty :puma_daemonize, false
-      set_if_empty :puma_tag, ''
-      set_if_empty :puma_restart_command, 'bundle exec puma'
+      set_if_empty :puma_access_log, -> { File.join(shared_path, 'log', "puma.log") }
+      set_if_empty :puma_error_log, -> { File.join(shared_path, 'log', "puma.log") }
 
       # Chruby, Rbenv and RVM integration
-      append :chruby_map_bins, 'puma', 'pumactl'
-      append :rbenv_map_bins, 'puma', 'pumactl'
-      append :rvm_map_bins, 'puma', 'pumactl'
+      append :chruby_map_bins, 'puma', 'pumactl' if fetch(:chruby_map_bins)
+      append :rbenv_map_bins, 'puma', 'pumactl' if fetch(:rbenv_map_bins)
+      append :rvm_map_bins, 'puma', 'pumactl' if fetch(:rvm_map_bins)
 
       # Bundler integration
       append :bundle_bins, 'puma', 'pumactl'
     end
-
-    def register_hooks
-      after 'deploy:check', 'puma:check'
-    end
-
-    def puma_workers
-      fetch(:puma_workers, 0)
-    end
-
-    def puma_preload_app?
-      fetch(:puma_preload_app)
-    end
-
-    def puma_daemonize?
-      fetch(:puma_daemonize)
-    end
-
-    def puma_plugins
-      Array(fetch(:puma_plugins)).collect do |bind|
-        "plugin '#{bind}'"
-      end.join("\n")
-    end
-
-    def upload_puma_rb(role)
-      template_puma 'puma', fetch(:puma_conf), role
-    end
   end
 end
 
-require 'capistrano/puma/workers'
-require 'capistrano/puma/daemon'
 require 'capistrano/puma/systemd'
-require 'capistrano/puma/monit'
-require 'capistrano/puma/jungle'
-require 'capistrano/puma/nginx'

data/lib/capistrano/tasks/systemd.rake

@@ -3,76 +3,65 @@
 git_plugin = self
 
 namespace :puma do
-  namespace :systemd do
-    desc 'Config Puma systemd service'
-    task :config do
-      on roles(fetch(:puma_role)) do |role|
-
-        upload_compiled_template = lambda do |template_name, unit_filename|
-          git_plugin.template_puma template_name, "#{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}"
-          else
-            execute :mkdir, "-p", systemd_path
-            execute :mv, "#{fetch(:tmp_dir)}/#{unit_filename}", "#{systemd_path}"
-          end
+  desc 'Install Puma systemd service'
+  task :install do
+    on roles(fetch(:puma_role)) do |role|
+
+      upload_compiled_template = lambda do |template_name, unit_filename|
+        git_plugin.template_puma template_name, "#{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}"
+        else
+          execute :mkdir, "-p", systemd_path
+          execute :mv, "#{fetch(:tmp_dir)}/#{unit_filename}", "#{systemd_path}"
         end
+      end
 
-        upload_compiled_template.call("puma.service", "#{fetch(:puma_service_unit_name)}.service")
-
-        if fetch(:puma_enable_socket_service)
-          upload_compiled_template.call("puma.socket", "#{fetch(:puma_service_unit_name)}.socket")
-        end
+      upload_compiled_template.call("puma.service", "#{fetch(:puma_service_unit_name)}.service")
 
-        # Reload systemd
-        git_plugin.execute_systemd("daemon-reload")
+      if fetch(:puma_enable_socket_service)
+        upload_compiled_template.call("puma.socket", "#{fetch(:puma_service_unit_name)}.socket")
       end
-    end
 
-    desc 'Generate service configuration locally'
-    task :generate_config_locally do
-      fake_role = Struct.new(:hostname)
-      run_locally do
-        File.write('puma.service', git_plugin.compiled_template_puma("puma.service", fake_role.new("example.com")).string)
-        if fetch(:puma_enable_socket_service)
-          File.write('puma.socket', git_plugin.compiled_template_puma("puma.socket", fake_role.new("example.com")).string)
-        end
-      end
+      # Reload systemd
+      git_plugin.execute_systemd("daemon-reload")
+      invoke "puma:enable"
     end
+  end
 
-    desc 'Enable Puma systemd service'
-    task :enable do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name))
-        git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
-
-        if fetch(:puma_systemctl_user) != :system && fetch(:puma_enable_lingering)
-          execute :loginctl, "enable-linger", fetch(:puma_lingering_user)
-        end
+  desc 'Uninstall Puma systemd service'
+  task :uninstall do
+    invoke 'puma:disable'
+    on roles(fetch(:puma_role)) do |role|
+      systemd_path = fetch(:puma_systemd_conf_dir, git_plugin.fetch_systemd_unit_path)
+      if fetch(:puma_systemctl_user) == :system
+        sudo "rm -f #{systemd_path}/#{fetch(:puma_service_unit_name)}*"
+      else
+        execute :rm, "-f", "#{systemd_path}/#{fetch(:puma_service_unit_name)}*"
       end
+      git_plugin.execute_systemd("daemon-reload")
     end
 
-    desc 'Disable Puma systemd service'
-    task :disable do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name))
-        git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
-      end
-    end
+  end
 
-    desc 'Stop Puma socket via systemd'
-    task :stop_socket do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("stop", fetch(:puma_service_unit_name) + ".socket")
+  desc 'Enable Puma systemd service'
+  task :enable do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name))
+      git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
+
+      if fetch(:puma_systemctl_user) != :system && fetch(:puma_enable_lingering)
+        execute :loginctl, "enable-linger", fetch(:puma_lingering_user)
       end
     end
+  end
 
-    desc 'Restart Puma socket via systemd'
-    task :restart_socket do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("restart", fetch(:puma_service_unit_name) + ".socket")
-      end
+  desc 'Disable Puma systemd service'
+  task :disable do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name))
+      git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
     end
   end
 
@@ -90,6 +79,13 @@ namespace :puma do
     end
   end
 
+  desc 'Stop Puma socket via systemd'
+  task :stop_socket do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("stop", fetch(:puma_service_unit_name) + ".socket")
+    end
+  end
+
   desc 'Restarts or reloads Puma service via systemd'
   task :smart_restart do
     if fetch(:puma_phased_restart)
@@ -106,16 +102,23 @@ namespace :puma do
     end
   end
 
+  desc 'Restart Puma socket via systemd'
+  task :restart_socket do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("restart", fetch(:puma_service_unit_name) + ".socket")
+    end
+  end
+
   desc 'Reload Puma service via systemd'
   task :reload do
     on roles(fetch(:puma_role)) do
       service_ok = if fetch(:puma_systemctl_user) == :system
-        execute("#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
-      else
-        execute("#{fetch(:puma_systemctl_bin)} --user status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
-      end
+                     execute("#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
+                   else
+                     execute("#{fetch(:puma_systemctl_bin)} --user status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
+                   end
       cmd = 'reload'
-      if !service_ok
+      unless service_ok
         cmd = 'restart'
       end
       if fetch(:puma_systemctl_user) == :system

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

@@ -1,28 +1,40 @@
+# 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)})" %>
-After=network.target
 <%= "Requires=#{fetch(:puma_service_unit_name)}.socket" if fetch(:puma_enable_socket_service) %>
+After=syslog.target network.target
 
 [Service]
-Type=simple
+Type=<%= service_unit_type %>
+WatchdogSec=10
 <%="User=#{puma_user(@role)}" if fetch(:puma_systemctl_user) == :system %>
 WorkingDirectory=<%= current_path %>
-# Support older bundler versions where file descriptors weren't kept
-# See https://github.com/rubygems/rubygems/issues/3254
-ExecStart=<%= expanded_bundle_command %> exec --keep-file-descriptors puma -C <%= fetch(:puma_conf) %>
+ExecStart=<%= expanded_bundle_command %> exec puma -e <%= fetch(:puma_env) %>
 ExecReload=/bin/kill -USR1 $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) %>
+<%- 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 -%>
 
-<% fetch(:puma_service_unit_env_vars, []).each do |environment_variable| %>
-<%="Environment=#{environment_variable}" %>
-<% end %>
-
-Restart=always
+# if we crash, restart
 RestartSec=1
+Restart=on-failure
 
-SyslogIdentifier=puma
+<%="StandardOutput=append:#{fetch(:puma_access_log)}" if fetch(:puma_access_log) %>
+<%="StandardError=append:#{fetch(:puma_error_log)}" if fetch(:puma_error_log) %>
 
+SyslogIdentifier=<%= fetch(:puma_service_unit_name) %>
 [Install]
 WantedBy=<%=(fetch(:puma_systemctl_user) == :system) ? "multi-user.target" : "default.target"%>

data/lib/generators/capistrano/nginx_puma/config_generator.rb

@@ -9,7 +9,6 @@ module Capistrano
           :banner => "path to templates"
 
         def copy_template
-          copy_file "../../../../capistrano/templates/puma.rb.erb", "#{templates_path}/puma.rb.erb"
           copy_file "../../../../capistrano/templates/nginx_conf.erb", "#{templates_path}/nginx_conf.erb"
           # copy_file "puma.rb.erb", "#{templates_path}/puma.rb.erb"
           # copy_file "puma_init.erb", "#{templates_path}/puma_init.erb"