Date: Sat, 14 Mar 2026 07:06:02 +0000 From: =?utf-8?Q?=C3=84lven?= <alven@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6771b1d14157 - main - net/v2ray: Lint and improve rc file Message-ID: <69b508da.308ab.7cdc462a@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by alven: URL: https://cgit.FreeBSD.org/ports/commit/?id=6771b1d14157a659a8e235f692526c97f83f435a commit 6771b1d14157a659a8e235f692526c97f83f435a Author: Älven <alven@FreeBSD.org> AuthorDate: 2026-03-14 06:48:56 +0000 Commit: Älven <alven@FreeBSD.org> CommitDate: 2026-03-14 07:05:19 +0000 net/v2ray: Lint and improve rc file * Sort stances * Expand variables Approved by: db@, yuri@ (Mentors, implicit) --- net/v2ray/Makefile | 2 +- net/v2ray/files/v2ray.in | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/net/v2ray/Makefile b/net/v2ray/Makefile index 9d65cb147ee3..6e3fe7cb4033 100644 --- a/net/v2ray/Makefile +++ b/net/v2ray/Makefile @@ -1,7 +1,7 @@ PORTNAME= v2ray DISTVERSIONPREFIX= v DISTVERSION= 5.46.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= alven@FreeBSD.org diff --git a/net/v2ray/files/v2ray.in b/net/v2ray/files/v2ray.in index 3778a4846d06..82d470d57d6d 100644 --- a/net/v2ray/files/v2ray.in +++ b/net/v2ray/files/v2ray.in @@ -1,7 +1,8 @@ #!/bin/sh # PROVIDE: v2ray -# REQUIRE: LOGIN +# REQUIRE: DAEMON NETWORKING FILESYSTEMS +# BEFORE: LOGIN # KEYWORD: shutdown # Add these lines to /etc/rc.conf.local or /etc/rc.conf to enable `v2ray': @@ -17,20 +18,22 @@ . /etc/rc.subr +desc="v2ray startup script" name="v2ray" -rcvar="${name}_enable" +rcvar="v2ray_enable" + load_rc_config ${name} : ${v2ray_enable="NO"} -: ${v2ray_config="%%PREFIX%%/etc/$name/config.json"} -: ${v2ray_logdir="/var/log/${name}"} : ${v2ray_env=""} -: ${v2ray_user="%%USER%%"} +: ${v2ray_config="%%PREFIX%%/etc/v2ray/config.json"} : ${v2ray_group="%%GROUP%%"} +: ${v2ray_user="%%USER%%"} +: ${v2ray_logdir="/var/log/v2ray"} -asset_env="V2RAY_LOCATION_ASSET=%%PREFIX%%/share/$name" -pidfile="/var/run/$name.pid" -procname="%%PREFIX%%/bin/$name" +asset_env="V2RAY_LOCATION_ASSET=%%DATADIR%%" +pidfile="/var/run/v2ray.pid" +procname="%%PREFIX%%/bin/v2ray" command="/usr/sbin/daemon" command_args="-c -p ${pidfile} /usr/bin/env ${asset_env} ${v2ray_env} ${procname} run -config ${v2ray_config}" required_files="${v2ray_config}" @@ -39,9 +42,8 @@ start_precmd="v2ray_startprecmd" v2ray_startprecmd() { touch "${pidfile}" - chown ${v2ray_user}:${v2ray_group} "${pidfile}" mkdir -p "${v2ray_logdir}" - chown -R ${v2ray_user}:${v2ray_group} "${v2ray_logdir}" + chown -R ${v2ray_user}:${v2ray_group} "${pidfile}" "${v2ray_logdir}" } run_rc_command "$1"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b508da.308ab.7cdc462a>