From 02abbdf6f6135d88e22a38bed26e85f39678aaf3 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 25 Jan 2024 00:38:09 +0800 Subject: [PATCH] v2raya: do not allow changing config/log directory We need stable path to persist configurations and read log from LuCI. Signed-off-by: Tianling Shen (cherry picked from commit 272cff0d1c6265fe374aeed582423858beedf6bc) --- net/v2raya/Makefile | 2 +- net/v2raya/files/v2raya.config | 6 ------ net/v2raya/files/v2raya.init | 5 +++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile index b7616064f1..b18a525e84 100644 --- a/net/v2raya/Makefile +++ b/net/v2raya/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA PKG_VERSION:=2.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config index 8ebf318cda..66b66b2438 100644 --- a/net/v2raya/files/v2raya.config +++ b/net/v2raya/files/v2raya.config @@ -5,9 +5,6 @@ config v2raya 'config' # Listening address option address '0.0.0.0:2017' - # v2rayA configuration directory - option config '/etc/v2raya' - # Make sure your IPv6 network works fine before you turn it on. # Optional values: auto, on, off. option ipv6_support 'auto' @@ -19,9 +16,6 @@ config v2raya 'config' # Optional values: trace, debug, info, warn or error option log_level 'info' - # The path of log file - option log_file '/var/log/v2raya/v2raya.log' - # Maximum number of days to keep log files option log_max_days '3' diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init index b4a7196130..1e55a187e4 100755 --- a/net/v2raya/files/v2raya.init +++ b/net/v2raya/files/v2raya.init @@ -40,12 +40,13 @@ start_service() { procd_set_param command "$PROG" procd_set_param env XDG_DATA_HOME="/usr/share" + append_env "config" "/etc/v2raya" + append_env "log_file" "/var/log/v2raya/v2raya.log" + append_env_arg "config" "address" "0.0.0.0:2017" - append_env_arg "config" "config" "/etc/v2raya" append_env_arg "config" "ipv6_support" "auto" append_env_arg "config" "nftables_support" "auto" append_env_arg "config" "log_level" "info" - append_env_arg "config" "log_file" "/var/log/v2raya/v2raya.log" append_env_arg "config" "log_max_days" "3" append_env_arg "config" "v2ray_bin" append_env_arg "config" "v2ray_confdir"