Use rc_configtest.

This commit is contained in:
ajacoutot 2022-08-29 19:15:18 +00:00
parent 54f31d9a96
commit 37ed8131fd
6 changed files with 14 additions and 10 deletions

View File

@ -3,6 +3,8 @@ COMMENT = authoritative DNS server
# update net/py-libknot when updating this # update net/py-libknot when updating this
DISTNAME = knot-3.2.0 DISTNAME = knot-3.2.0
REVISION = 0
SHARED_LIBS += dnssec 3.1 # .9.0 SHARED_LIBS += dnssec 3.1 # .9.0
SHARED_LIBS += knot 8.0 # .13.0 SHARED_LIBS += knot 8.0 # .13.0
SHARED_LIBS += zscanner 1.1 # .4.0 SHARED_LIBS += zscanner 1.1 # .4.0

View File

@ -2,13 +2,15 @@
daemon="${PREFIX}/sbin/knotd -d" daemon="${PREFIX}/sbin/knotd -d"
knotc="${PREFIX}/sbin/knotc" knotc="${PREFIX}/sbin/knotc"
knotcheckconf="${knotc} conf-check"
. /etc/rc.d/rc.subr . /etc/rc.d/rc.subr
rc_configtest() {
${knotc} conf-check
}
rc_pre() { rc_pre() {
install -d -o _knot -g wheel -m 750 /var/run/knot/ install -d -o _knot -g wheel -m 750 /var/run/knot/
${knotcheckconf}
} }
rc_check() { rc_check() {
@ -16,7 +18,7 @@ rc_check() {
} }
rc_reload() { rc_reload() {
${knotcheckconf} && ${knotc} reload ${knotc} reload
} }
rc_stop() { rc_stop() {

View File

@ -4,7 +4,7 @@ CATEGORIES = sysutils
HOMEPAGE = https://puck.nether.net/sysmon/ HOMEPAGE = https://puck.nether.net/sysmon/
MAINTAINER = George Rosamond <george@nycbug.org> MAINTAINER = George Rosamond <george@nycbug.org>
REVISION = 3 REVISION = 4
# GPLv2 # GPLv2
PERMIT_PACKAGE = Yes PERMIT_PACKAGE = Yes

View File

@ -6,9 +6,8 @@ daemon_timeout="60"
. /etc/rc.d/rc.subr . /etc/rc.d/rc.subr
rc_reload() { rc_configtest() {
${daemon} ${daemon_flags} -t && \ ${daemon} ${daemon_flags} -t
pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
} }
rc_cmd $1 rc_cmd $1

View File

@ -36,6 +36,8 @@ PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION} PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION} PKGNAME-securelink= nginx-securelink-${VERSION}
REVISION-main= 0
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
MASTER_SITES= https://nginx.org/download/ MASTER_SITES= https://nginx.org/download/

View File

@ -7,9 +7,8 @@ daemon="${TRUEPREFIX}/sbin/nginx"
pexp="nginx: master process ${daemon}${daemon_flags:+ ${daemon_flags}}" pexp="nginx: master process ${daemon}${daemon_flags:+ ${daemon_flags}}"
rc_stop_signal=QUIT rc_stop_signal=QUIT
rc_reload() { rc_configtest() {
${daemon} ${daemon_flags} -t && ${daemon} ${daemon_flags} -t
pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
} }
rc_cmd $1 rc_cmd $1