Skip to content

Commit 3c69133

Browse files
committed
use RuntimeDirectory + PIDFile instead of tmpfiles.d
1 parent a00565c commit 3c69133

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

bin/setup-cpantestersmatrix-doit.pl

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,6 @@ sub priv_setup {
197197
#$priv_doit->write_binary('/etc/cron.d/fast-matrix', $cron_contents);
198198
}
199199

200-
my $tmpfiles_path = "/etc/tmpfiles.d/starman_cpan-testers-matrix.conf";
201-
my $tmpfiles_contents = <<"EOF";
202-
d /run/starman_cpan-testers-matrix 0755 www-data www-data -
203-
EOF
204-
if ($priv_doit->write_binary($tmpfiles_path, $tmpfiles_contents)) {
205-
$priv_doit->system('systemd-tmpfiles', '--create', $tmpfiles_path);
206-
}
207-
208200
my $unit_contents = <<"EOF";
209201
[Unit]
210202
Description=$variant_info->{unit_name}
@@ -213,7 +205,11 @@ sub priv_setup {
213205
[Service]
214206
User=www-data
215207
Group=www-data
216-
ExecStart=/usr/bin/starman -l $variant_info->{listen_host}:$variant_info->{port} --pid /run/starman_cpan-testers-matrix/$variant_info->{unit_name}.pid $repo_localdir/cpan-testers-matrix.psgi
208+
209+
RuntimeDirectory=starman_$variant_info->{unit_name}
210+
PIDFile=/run/starman_$variant_info->{unit_name}/starman.pid
211+
212+
ExecStart=/usr/bin/starman -l $variant_info->{listen_host}:$variant_info->{port} --pid /run/starman_$variant_info->{unit_name}/starman.pid $repo_localdir/cpan-testers-matrix.psgi
217213
Environment="BOTCHECKER_JS_ENABLED=1"
218214
Restart=always
219215

0 commit comments

Comments
 (0)