pkgsrc-WIP-changes archive

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

knot-resolver: working to be running on dedicated user



Module Name:	pkgsrc-wip
Committed By:	Marcin Gondek <drixter%e-utp.net@localhost>
Pushed By:	drixter
Date:		Sat Jun 27 15:07:13 2026 +0200
Changeset:	1854d1380c52736bbbf18b4a295c7b7021020178

Modified Files:
	knot-resolver/Makefile
	knot-resolver/files/kresd.sh

Log Message:
knot-resolver: working to be running on dedicated user

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1854d1380c52736bbbf18b4a295c7b7021020178

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

diffstat:
 knot-resolver/Makefile       |  2 ++
 knot-resolver/files/kresd.sh | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diffs:
diff --git a/knot-resolver/Makefile b/knot-resolver/Makefile
index b72c12b4fa..081f5401b2 100644
--- a/knot-resolver/Makefile
+++ b/knot-resolver/Makefile
@@ -34,6 +34,8 @@ CONF_FILES+=	${PREFIX}/share/examples/knot-resolver/root.keys     ${PKG_SYSCONFD
 
 AUTO_MKDIRS=		yes
 
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/knot-resolver ${KRESD_USER} ${KRESD_GROUP} 0755
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/etc/knot-resolver/icann-ca.pem ${DESTDIR}${PREFIX}/share/examples/knot-resolver/
 	${MV} ${DESTDIR}${PREFIX}/etc/knot-resolver/root.hints ${DESTDIR}${PREFIX}/share/examples/knot-resolver/
diff --git a/knot-resolver/files/kresd.sh b/knot-resolver/files/kresd.sh
index 76f2186523..863725d19d 100644
--- a/knot-resolver/files/kresd.sh
+++ b/knot-resolver/files/kresd.sh
@@ -11,15 +11,28 @@
 name="kresd"
 rcvar="kresd_enable"
 
-knotresolver_user="kresd"
-knotresolver_command="@PREFIX@/sbin/kresd -n -c @PKG_SYSCONFDIR@/kresd.conf @PKG_SYSCONFDIR@/knot-resolver"
+knotresolver_user="${name}"
+knotresolver_command="@PREFIX@/sbin/${name} -n -c @PKG_SYSCONFDIR@/${name}.conf @PKG_SYSCONFDIR@/knot-resolver"
+
+kresd_precmd()
+{
+    if [ ! -d "@VARBASE@/log/${name}/" ]; then
+        install -d -o ${name} -g ${name} -m 755 "@VARBASE@/log/${name}/"
+    fi
+
+    if [ ! -e "@VARBASE@/log/${name}/${name}.log" ]; then
+        install -o ${name} -g ${name} -m 644 /dev/null "@VARBASE@/log/${name}/${name}.log"
+    fi
+}
 
 pidfile="/var/run/${name}.pid"
 command="@PREFIX@/sbin/daemonize"
-command_args="-p ${pidfile} -u ${knotresolver_user} -o @VARBASE@/log/kresd.log -- ${knotresolver_command}"
+command_args="-p ${pidfile} -u ${knotresolver_user} -o @VARBASE@/log/${name}/${name}.log -- ${knotresolver_command}"
 
-procname="@PREFIX@/sbin/kresd"
+procname="@PREFIX@/sbin/${name}"
 
 load_rc_config $name
+start_precmd="kresd_precmd"
+
 run_rc_command "$1"
 


Home | Main Index | Thread Index | Old Index