mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
Make knotd startup script work again.
From the PR: When submitting PR 183682 I was unaware the patch as in PR 182792 wasn't committed yet. So to my amazing I just noticed the startup problem still exists. Enclosed patch is basicly the same as the uncommited one, but besides the removal of the -w option, knotd now starts by default as a daemon (-d) in stead of interactive (-i). So I could simplify the startup script a lot. PR: ports/183891 Submitted by: Leo Vandewoestijne <freebsd@dns-lab.com> (maintainer)
This commit is contained in:
parent
6a42eb9ec9
commit
c3f6bc24f3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=337542
3 changed files with 16 additions and 31 deletions
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= knot
|
PORTNAME= knot
|
||||||
DISTVERSION= 1.3.3
|
DISTVERSION= 1.3.3
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= dns ipv6
|
CATEGORIES= dns ipv6
|
||||||
MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
|
MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
|
||||||
http://dns-lab.com/downloads/knot-dns/
|
http://dns-lab.com/downloads/knot-dns/
|
||||||
|
@ -37,5 +38,9 @@ post-install:
|
||||||
${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}
|
${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}
|
||||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||||
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
|
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
|
||||||
|
@${MKDIR} ${PREFIX}/var/lib/knot
|
||||||
|
@${MKDIR} ${PREFIX}/var/run/knot
|
||||||
|
@${CHOWN} 53:53 ${PREFIX}/var/lib/knot
|
||||||
|
@${CHOWN} 53:53 ${PREFIX}/var/run/knot
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
@ -19,32 +19,21 @@ name=knot
|
||||||
rcvar=knot_enable
|
rcvar=knot_enable
|
||||||
|
|
||||||
extra_commands="reload"
|
extra_commands="reload"
|
||||||
reload_cmd="${name}_reload"
|
reload_cmd="${name}_x reload"
|
||||||
status_cmd="${name}_status"
|
status_cmd="${name}_x status"
|
||||||
stop_cmd="${name}_stop"
|
stop_cmd=" ${name}_x stop"
|
||||||
|
|
||||||
load_rc_config ${name}
|
load_rc_config ${name}
|
||||||
|
|
||||||
: ${knot_enable:="NO"}
|
: ${knot_enable:="NO"}
|
||||||
: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}
|
: ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}
|
||||||
|
|
||||||
command=%%PREFIX%%/sbin/${name}c
|
command=%%PREFIX%%/sbin/${name}d
|
||||||
procname=%%PREFIX%%/sbin/${name}d
|
command_args="-c ${knot_config} -d"
|
||||||
pidfile=/var/run/${name}.pid
|
|
||||||
|
|
||||||
command_args="-c ${knot_config} -w start"
|
|
||||||
required_files=${knot_config}
|
required_files=${knot_config}
|
||||||
|
|
||||||
knot_reload() {
|
knot_x() {
|
||||||
echo "Reloading ${name}."
|
%%PREFIX%%/sbin/${name}c -c ${knot_config} "$1"
|
||||||
${command} -c ${knot_config} reload
|
|
||||||
}
|
|
||||||
knot_status() {
|
|
||||||
${command} -c ${knot_config} status
|
|
||||||
}
|
|
||||||
knot_stop() {
|
|
||||||
echo "Stopping ${name}."
|
|
||||||
${command} -c ${knot_config} stop
|
|
||||||
}
|
}
|
||||||
|
|
||||||
run_rc_command "$1"
|
run_rc_command "$1"
|
||||||
|
|
|
@ -1,30 +1,21 @@
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
#
|
#
|
||||||
# To start using Knot DNS, you should complete the following tasks:
|
# To get Knot DNS started:
|
||||||
#
|
|
||||||
# ----- configure --------------------------------------------------
|
|
||||||
#
|
#
|
||||||
cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
|
cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
|
||||||
$EDITOR %%ETCDIR%%/knot.conf
|
$EDITOR %%ETCDIR%%/knot.conf
|
||||||
#
|
|
||||||
# ----- prepare ----------------------------------------------------
|
|
||||||
#
|
|
||||||
# required:
|
|
||||||
echo knot_enable=\"YES\" >> /etc/rc.conf
|
echo knot_enable=\"YES\" >> /etc/rc.conf
|
||||||
# for customization if desired:
|
|
||||||
# echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf
|
# echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf
|
||||||
#
|
|
||||||
# ----- startup ----------------------------------------------------
|
|
||||||
#
|
|
||||||
%%PREFIX%%/etc/rc.d/knotd start
|
%%PREFIX%%/etc/rc.d/knotd start
|
||||||
#
|
#
|
||||||
####################################################################
|
####################################################################
|
||||||
|
|
||||||
|
|
||||||
When upgrading from version of before 1.3.0-RC1:
|
When upgrading from version of before 1.3.0-RC1:
|
||||||
mind the default config file location has changed.
|
mind the default config file location has changed.
|
||||||
|
|
||||||
|
When upgrading from version of 1.3.1-RC1 or before:
|
||||||
|
the startup script has changed due to parameter changes.
|
||||||
|
That problem reapeared in port 1.3.3 and was fixed in 1.3.3_1.
|
||||||
|
|
||||||
====================================================================
|
====================================================================
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue