pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/prosody prosody: make sure pidfile always matches...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f6589046c820
branches:  trunk
changeset: 381427:f6589046c820
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Thu Jul 07 02:31:45 2022 +0000

description:
prosody: make sure pidfile always matches PROSODY_RUN in the RC script

This concludes my investigation on the correct path for the PID file.
No changes to the final binary if PROSODY_RUN is set to its default
value.

Tested on NetBSD/amd64.

XXX pull-up to pkgsrc-2022Q2

diffstat:

 chat/prosody/Makefile         |  3 ++-
 chat/prosody/files/prosody.sh |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r d47aef62149e -r f6589046c820 chat/prosody/Makefile
--- a/chat/prosody/Makefile     Thu Jul 07 01:53:00 2022 +0000
+++ b/chat/prosody/Makefile     Thu Jul 07 02:31:45 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2022/07/07 01:53:00 khorben Exp $
+# $NetBSD: Makefile,v 1.39 2022/07/07 02:31:45 khorben Exp $
 
 DISTNAME=              prosody-0.12.0
 PKGREVISION=           1
@@ -70,6 +70,7 @@
 MAKE_FILE=             makefile
 
 RCD_SCRIPTS=           prosody
+FILES_SUBST+=          PROSODY_RUN=${PROSODY_RUN}
 
 TEST_TARGET=           test
 
diff -r d47aef62149e -r f6589046c820 chat/prosody/files/prosody.sh
--- a/chat/prosody/files/prosody.sh     Thu Jul 07 01:53:00 2022 +0000
+++ b/chat/prosody/files/prosody.sh     Thu Jul 07 02:31:45 2022 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prosody.sh,v 1.3 2022/07/07 01:53:00 khorben Exp $
+# $NetBSD: prosody.sh,v 1.4 2022/07/07 02:31:46 khorben Exp $
 #
 # PROVIDE: prosody
 # REQUIRE: DAEMON
@@ -13,7 +13,7 @@
 rcvar=${name}
 ctl_command="@PREFIX@/bin/${name}ctl"
 required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
-pidfile="@VARBASE@/run/prosody/${name}.pid"
+pidfile="@PROSODY_RUN@/${name}.pid"
 #start_precmd="ulimit -n 2048"
 extra_commands="reload status"
 



Home | Main Index | Thread Index | Old Index