diff options
author | Yuri Victorovich <yuri@FreeBSD.org> | 2021-03-03 19:27:40 +0000 |
---|---|---|
committer | Yuri Victorovich <yuri@FreeBSD.org> | 2021-03-03 19:27:40 +0000 |
commit | 47b61d7c4f6fd5c9b1f2180b1b9ebbac390969a8 (patch) | |
tree | 718197a9b7384242ba0d998bdabe4509ad2d7261 | |
parent | 7d5db05bf0392ba515e8c376e9a9adb368708419 (diff) | |
download | ports-47b61d7c4f6fd5c9b1f2180b1b9ebbac390969a8.tar.gz ports-47b61d7c4f6fd5c9b1f2180b1b9ebbac390969a8.zip |
net/coturn: rc script fixes
* Fetch pidfile from config file
* Integrate into ports Makefile correctly
* Pet rclint
PR: 253978
Submitted by: crees
Notes
Notes:
svn path=/head/; revision=567256
-rw-r--r-- | net/coturn/Makefile | 7 | ||||
-rw-r--r-- | net/coturn/files/turnserver-service.in | 29 | ||||
-rw-r--r-- | net/coturn/files/turnserver.in | 37 | ||||
-rw-r--r-- | net/coturn/pkg-plist | 1 |
4 files changed, 40 insertions, 34 deletions
diff --git a/net/coturn/Makefile b/net/coturn/Makefile index 062803dfe877..ef03e9b18fcb 100644 --- a/net/coturn/Makefile +++ b/net/coturn/Makefile @@ -2,7 +2,7 @@ PORTNAME= coturn DISTVERSION= 4.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -18,11 +18,11 @@ USE_GITHUB= yes SHEBANG_FILES= examples/scripts/oauth.sh examples/scripts/restapi/shared_secret_maintainer.pl +USE_RC_SUBR= turnserver + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static --enable-shared --turndbdir=/var/db/${PORTNAME} -SUB_FILES= turnserver-service - DOCSDIR= ${PREFIX}/share/doc/turnserver EXAMPLESDIR= ${PREFIX}/share/examples/turnserver @@ -32,7 +32,6 @@ PORTDOCS= * PORTEXAMPLES= * post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/turnserver-service ${STAGEDIR}${PREFIX}/etc/rc.d/turnserver ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include <bsd.port.mk> diff --git a/net/coturn/files/turnserver-service.in b/net/coturn/files/turnserver-service.in deleted file mode 100644 index 7cfb7632bc16..000000000000 --- a/net/coturn/files/turnserver-service.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# -# PROVIDE: turnserver -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: shutdown -# - -. /etc/rc.subr - -name="turnserver" -rcvar="${name}_enable" -command="%%PREFIX%%/bin/${name}" -pidfile="/var/run/${name}.pid" -required_files="%%PREFIX%%/etc/${name}.conf" - -load_rc_config ${name} - -: ${turnserver_enable="NO"} -: ${turnserver_flags="-o"} -: ${turnserver_configfile:=%%PREFIX%%/etc/$name.conf} - -command_args="-c ${turnserver_configfile} ${turnserver_flags}" - -run_rc_command "$1" diff --git a/net/coturn/files/turnserver.in b/net/coturn/files/turnserver.in new file mode 100644 index 000000000000..c0eaf4dc113f --- /dev/null +++ b/net/coturn/files/turnserver.in @@ -0,0 +1,37 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: turnserver +# REQUIRE: DAEMON +# BEFORE: mail +# KEYWORD: shutdown + +. /etc/rc.subr + +name=turnserver +rcvar=turnserver_enable +desc=TURN and STUN server + +load_rc_config ${name} + +: ${turnserver_enable:="NO"} +: ${turnserver_configfile:=%%PREFIX%%/etc/$name.conf} + +command="%%PREFIX%%/bin/${name}" +required_files="%%PREFIX%%/etc/${name}.conf" +start_precmd=find_pidfile +stop_precmd=find_pidfile +status_precmd=find_pidfile +command_args="-o -c ${turnserver_configfile}" + +find_pidfile() +{ + if get_pidfile_from_conf pidfile $turnserver_configfile; then + pidfile="$_pidfile_from_conf" + else + pidfile="/var/run/${name}.pid" + fi +} + +run_rc_command "$1" diff --git a/net/coturn/pkg-plist b/net/coturn/pkg-plist index 52566ed12679..a71ea9cdd5df 100644 --- a/net/coturn/pkg-plist +++ b/net/coturn/pkg-plist @@ -5,7 +5,6 @@ bin/turnutils_oauth bin/turnutils_peer bin/turnutils_stunclient bin/turnutils_uclient -etc/rc.d/turnserver @sample etc/turnserver.conf.default etc/turnserver.conf include/turn/client/TurnMsgLib.h include/turn/client/ns_turn_ioaddr.h |