CVS commit: pkgsrc/chat/prosody

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Mon Jul 25 04:47:07 UTC 2022

Modified Files:
        pkgsrc/chat/prosody: Makefile
        pkgsrc/chat/prosody/files: prosody.sh

Log Message:
chat/prosody: always create the directory for the PID file

The RC script for prosody now always creates the corresponding
sub-directory for prosody's PID file. This is inspired by the RC script
for mdnsd in NetBSD, and for dbus in pkgsrc; thanks spz@ for the
suggestion!

Bumps PKGREVISION.

Tested on NetBSD/amd64.

XXX pull-up to pkgsrc-2022Q2 (completes request 6649)


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/chat/prosody/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/prosody/files/prosody.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/prosody/Makefile
diff -u pkgsrc/chat/prosody/Makefile:1.39 pkgsrc/chat/prosody/Makefile:1.40
--- pkgsrc/chat/prosody/Makefile:1.39   Thu Jul  7 02:31:45 2022
+++ pkgsrc/chat/prosody/Makefile        Mon Jul 25 04:47:06 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2022/07/07 02:31:45 khorben Exp $
+# $NetBSD: Makefile,v 1.40 2022/07/25 04:47:06 khorben Exp $
 
 DISTNAME=              prosody-0.12.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            chat
 MASTER_SITES=          https://prosody.im/downloads/source/
 
@@ -71,6 +71,8 @@ MAKE_FILE=            makefile
 
 RCD_SCRIPTS=           prosody
 FILES_SUBST+=          PROSODY_RUN=${PROSODY_RUN}
+FILES_SUBST+=          PROSODY_USER=${PROSODY_USER}
+FILES_SUBST+=          PROSODY_GROUP=${PROSODY_GROUP}
 
 TEST_TARGET=           test
 

Index: pkgsrc/chat/prosody/files/prosody.sh
diff -u pkgsrc/chat/prosody/files/prosody.sh:1.4 pkgsrc/chat/prosody/files/prosody.sh:1.5
--- pkgsrc/chat/prosody/files/prosody.sh:1.4    Thu Jul  7 02:31:46 2022
+++ pkgsrc/chat/prosody/files/prosody.sh        Mon Jul 25 04:47:06 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prosody.sh,v 1.4 2022/07/07 02:31:46 khorben Exp $
+# $NetBSD: prosody.sh,v 1.5 2022/07/25 04:47:06 khorben Exp $
 #
 # PROVIDE: prosody
 # REQUIRE: DAEMON
@@ -14,9 +14,18 @@ rcvar=${name}
 ctl_command="@PREFIX@/bin/${name}ctl"
 required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
 pidfile="@PROSODY_RUN@/${name}.pid"
-#start_precmd="ulimit -n 2048"
+start_precmd="prosody_precmd"
 extra_commands="reload status"
 
+prosody_precmd()
+{
+    if [ ! -d @PROSODY_RUN@ ]; then
+        @MKDIR@ -m 0755 @PROSODY_RUN@
+    fi
+    @CHOWN@ @PROSODY_USER@:@PROSODY_GROUP@ @PROSODY_RUN@
+    #ulimit -n 2048
+}
+
 start_cmd="${ctl_command} start"
 stop_cmd="${ctl_command} stop"
 reload_cmd="${ctl_command} reload"