capistrano-systemd-ng 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e98a1566194f4df7c6c9db43a9ad46b94dd306e04f951b9bb238e497f61066f
-  data.tar.gz: b8316d110262ce8e20c7ab222a28df7a35786e2724091c111ada97de3d4b3e31
+  metadata.gz: a50ddb67a418be03b5d2920ae7f6ae33de0599517ad6d7120ddcd4918a4a325b
+  data.tar.gz: a8974fa62acd4a059346cc4a7ecea4eeddae91e5b753504b05ed6500a6fd067c
 SHA512:
-  metadata.gz: 7c18bf423a59970a616448be2d7d955cddb65dcce6754b0e3ab02c90129431628e58a6da3173c067e7f99c52ad888430ea54ed25f0636b8308d61462a7d168f6
-  data.tar.gz: 37b19e87c582fb4b28b5187a72bf1b8ca2c5b8ab132b65dd992a8b2ed806808fb4705cf80982d4b0b9286e36f272fa60f5de216ac1ed2452e393ea9369e52c5f
+  metadata.gz: 9002a9eeebb5ffa552d66f3339ca2121ab825455545bdf861bf9653d0d8691f0243ded4c8273f06c893d4d06068bc21b1ba80930ee8042a8f179e06d79398318
+  data.tar.gz: 561b0469b18e7b0d5d2578827ae746ac41298464381889a84e70edd7ca7a128cdc6cc5031fd7cb59e8b375ba7cb106c2d3f681d23014fec62543b086bdb6d4a6

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.
@@ -83,6 +83,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/capistrano-systemd-ng.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "mocha", "~> 1.2"
+  spec.add_development_dependency "mocha", "~> 2.0"
 end

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

@@ -42,7 +42,7 @@ module Capistrano
 
           set_if_empty :"#{prefix}_units_dest", ->{
             fetch(:"#{prefix}_units_src").map{|src|
-              "%s/%s_%s" % [ fetch(:"#{prefix}_units_dir"), fetch(:application), File.basename(src, ".erb") ]
+              "%s/%s_%s-%s" % [ fetch(:"#{prefix}_units_dir"), fetch(:application),  fetch(:stage), File.basename(src, ".erb") ]
             }
           }
 

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

@@ -20,6 +20,8 @@ module Capistrano
         protected
 
         def setup_service(buf, src, dest)
+          backend.execute :mkdir, '-p', fetch(:"#{prefix}_units_dir") 
+          backend.execute :loginctl, 'enable-linger' 
           backend.upload! buf, dest
         end
       end

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Systemd
     module MultiService
-      VERSION = "0.1.1"
+      VERSION = "0.1.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-systemd-ng
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 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
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 description: Capistrano Plugin to control services by systemd (supports capistrano
   > 3.17.0)
 email: