From b71ca995dc989cd312d547daf72fee4bfb069e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de> Date: Tue, 10 Jan 2023 11:44:45 +0100 Subject: [PATCH] fix: add required --config-file CLI flag for stopping SubDisApp. It's mandatory because it contains the path to the PID file. --- templates/etc/systemd/user/disapp.service.j2 | 8 ++++++-- templates/etc/systemd/user/subapp.service.j2 | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/etc/systemd/user/disapp.service.j2 b/templates/etc/systemd/user/disapp.service.j2 index 5786c0a..f5c1e24 100644 --- a/templates/etc/systemd/user/disapp.service.j2 +++ b/templates/etc/systemd/user/disapp.service.j2 @@ -14,8 +14,12 @@ ExecStartPre=/bin/bash -c '\ cat $BLOCKFILE; \ exit 1; \ fi' -ExecStart=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/disapp_rosetta.pl --config-file {{ vault_subapp_vars.files.disapp.path }} --start -ExecStop=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/disapp_rosetta.pl --stop +ExecStart=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/disapp_rosetta.pl \ + --config-file {{ vault_subapp_vars.files.disapp.path }} \ + --start +ExecStop=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/disapp_rosetta.pl \ + --config-file {{ vault_subapp_vars.files.disapp.path }} \ + --stop User={{ vault_disapp_user }} Group={{ vault_disapp_group }} # EXAMPLE: TimeoutSec=600 diff --git a/templates/etc/systemd/user/subapp.service.j2 b/templates/etc/systemd/user/subapp.service.j2 index 248fcb2..191a235 100644 --- a/templates/etc/systemd/user/subapp.service.j2 +++ b/templates/etc/systemd/user/subapp.service.j2 @@ -14,8 +14,12 @@ ExecStartPre=/bin/bash -c '\ cat $BLOCKFILE; \ exit 1; \ fi' -ExecStart=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/subapp_rosetta.pl --config-file {{ vault_subapp_vars.files.subapp.path }} --start -ExecStop=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/subapp_rosetta.pl --stop +ExecStart=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/subapp_rosetta.pl \ + --config-file {{ vault_subapp_vars.files.subapp.path }} \ + --start +ExecStop=/usr/bin/perl -I /usr/local/perl/ /usr/local/bin/subapp_rosetta.pl \ + --config-file {{ vault_subapp_vars.files.subapp.path }} \ + --stop User={{ vault_subapp_user }} Group={{ vault_subapp_group }} # EXAMPLE: TimeoutSec=600 -- GitLab