capistrano-systemd-ng 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2465b8af1c66f78bb36e1b385b74eb6dc1c083148c1925c8fceec6a036ddb4
-  data.tar.gz: 9595a31afc13f291f32aafaabc604e52aa0ddcd0f1a6087d4370d799f59602ad
+  metadata.gz: bb84da1ac6f33cc067142d9dd9348c7815583319ca23e64c2e90f1c30799810f
+  data.tar.gz: 293ed348d3871183e49ae5ce4ab4c7bed5ba31c7734306c4f50b3c8aff7fd61e
 SHA512:
-  metadata.gz: 58dee30948ac5ea137e01f67435104342b56dfb843f3c05bf21bca7022595a01e7c698bbd5bc8dbdc67ce613bf3fdbe64e797ee2b7059d5524b16924ecda5b6d
-  data.tar.gz: 0d6f526890d527b3e23990954c6018951839177e20b7d95d1dd82d04bd7736e16693d91e5d5b02f5fa03d97bdf296672ac8d35f508e6c8694a5f1155b7dba884
+  metadata.gz: 0c742af5b9d483b4a8ae1e439bce8bf59cc6236e8a8a98de56e9d7f4935966006aa2a9599ef9edd4fb66d3acac4b5eff590fd98256a13314801b80fd5a493edc
+  data.tar.gz: 8b7a28307b5bbe1edf285cb7838e961dd76c9c3ead8981c9d29c53751475dc918ac1d92d9eeaed92cf980751793fd0976b59fa3acbeb31e5f5fdebc52e552f92

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.7, '3.0', 3.1]
+        ruby-version: [2.7, 3.0, 3.1, 3.2.2]
       fail-fast: false
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:

data/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2016 YAMADA Tsuyoshi
+Copyright (c) 2023 Gaspard d'Hautefeuille, Danil Pismenny
+Copyright (c) 2016-2022 YAMADA Tsuyoshi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
 # capistrano-systemd-ng
 
-[![Gem Version](https://badge.fury.io/rb/capistrano-systemd-ng.png)](https://rubygems.org/gems/capistrano-systemd-ng) [![CI](https://github.com/HLFH/capistrano-systemd-ng/actions/workflows/ci.yml/badge.svg)](https://github.com/HLFH/capistrano-systemd-ng/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/capistrano-systemd-ng.svg)](https://rubygems.org/gems/capistrano-systemd-ng) [![CI](https://github.com/HLFH/capistrano-systemd-ng/actions/workflows/ci.yml/badge.svg)](https://github.com/HLFH/capistrano-systemd-ng/actions/workflows/ci.yml)
 
 This gem adds capistrano tasks to control multiple services with systemd.
 This gem supports capistrano > 3.17.0.
@@ -23,7 +23,13 @@ Or install it yourself as:
 
 ## Usage
 
-Add these lines to your Capfile:
+Please activate the Capistrano `app`role in `config/deploy/staging.rb`and/or `config/deploy/production.rb`:
+```
+ role :app, %w{deploy@example.com}
+```
+Replace `example.com` by the domain name used by your server.
+
+And add these lines to your Capfile:
 
 ```ruby
 require "capistrano/systemd/multiservice"
@@ -83,6 +89,40 @@ If using the user service type services will be installed in your users home dir
 Systemd commands on those services can be run by passing a `--user` flag, e.g. ```systemctl --user list-unit-files```
 Nothing else in setup should require change and Capistrano tasks should remain the same as when installing system services.
 
+Example of user service in `config/systemd/passenger.service.erb`:
+```
+[Unit]
+Description=Passenger Standalone Application Server for <%= fetch(:application) %>
+After=network.target
+
+[Service]
+Type=forking
+Environment=RAILS_ENV=<%= fetch(:rails_env) %>
+Environment=PWD=<%= current_path %>
+WorkingDirectory=<%= current_path %>
+PIDFile=/run/passenger/devopsy.pid
+ExecStart=/home/deploy/.asdf/bin/asdf exec bundle exec passenger start -d --pid-file /run/passenger/devopsy.pid -e production -p 3002 --instance-registry-dir /run/passenger
+ExecStop=/home/deploy/.asdf/bin/asdf exec bundle exec passenger stop --pid-file /run/passenger/devopsy.pid
+PrivateTmp=yes
+
+[Install]
+WantedBy=default.target
+``` 
+For user services, the target should be `default.target`, not `multi-user.target`.
+And no `User` or `Group` should be mentioned to avoid errors.
+
+It is in `config/deploy.rb` that you should have the user set, and for that example:
+```
+set :user, "deploy"
+after 'deploy:publishing', 'systemd:passenger:restart'
+```
+
+And in the `Capfile`, you should have these:
+```
+require "capistrano/systemd/multiservice"
+install_plugin Capistrano::Systemd::MultiService.new_service("passenger", service_type: "user")
+```
+
 ## Capistrano Tasks
 
 With `install_plugin Capistrano::Systemd::MultiService.new_service("example1")`,

data/lib/capistrano/systemd/multiservice/system_service.rb

@@ -77,7 +77,7 @@ module Capistrano
 
         def setup
           fetch(:"#{prefix}_units_src").zip(fetch(:"#{prefix}_units_dest")).each do |src, dest|
-            buf = StringIO.new(ERB.new(File.read(src), nil, 2).result(binding))
+            buf = StringIO.new(ERB.new(File.read(src), trim_mode: '-', eoutvar: '@output_buffer').result(binding))
             setup_service buf, src, dest
           end
         end

data/lib/capistrano/systemd/multiservice/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Systemd
     module MultiService
-      VERSION = "0.1.2"
+      VERSION = "0.1.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-systemd-ng
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Gaspard d'Hautefeuille
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano