CVS commit: pkgsrc/net/mosquitto/files

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Oct  6 14:21:35 UTC 2023

Modified Files:
        pkgsrc/net/mosquitto/files: mosquitto.sh

Log Message:
mosquitto: Patch rc.d script for setting user from rc.conf


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/mosquitto/files/mosquitto.sh

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

Modified files:

Index: pkgsrc/net/mosquitto/files/mosquitto.sh
diff -u pkgsrc/net/mosquitto/files/mosquitto.sh:1.6 pkgsrc/net/mosquitto/files/mosquitto.sh:1.7
--- pkgsrc/net/mosquitto/files/mosquitto.sh:1.6 Fri Oct  6 07:50:54 2023
+++ pkgsrc/net/mosquitto/files/mosquitto.sh     Fri Oct  6 14:21:35 2023
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mosquitto.sh,v 1.6 2023/10/06 07:50:54 triaxx Exp $
+# $NetBSD: mosquitto.sh,v 1.7 2023/10/06 14:21:35 triaxx Exp $
 #
 # PROVIDE: mosquitto
 # REQUIRE: DAEMON
@@ -9,12 +9,16 @@ $_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 
 name="mosquitto"
 rcvar=$name
+
+load_rc_config $name
+
+: ${mosquitto_user:=@MOSQUITTO_USER@}
+
 command="@PREFIX@/sbin/${name}"
+command_args="-d -c @PKG_SYSCONFDIR@/${name}.conf"
+
 piddir="@VARBASE@/run/${name}"
 pidfile="${piddir}/${name}.pid"
-config="@PKG_SYSCONFDIR@/${name}.conf"
-
-command_args="-d -c $config"
 
 start_precmd="mosquitto_precmd"
 test_cmd="mosquitto_test"
@@ -23,8 +27,7 @@ extra_commands=""
 mosquitto_precmd()
 {
     mkdir -p ${piddir}
-    chown @MOSQUITTO_USER@ ${piddir}
+    chown ${mosquitto_user} ${piddir}
 }
 
-load_rc_config $name
 run_rc_command "$1"