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 <cnsztl@immortalwrt.org>
(cherry picked from commit 272cff0d1c6265fe374aeed582423858beedf6bc)

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 5f4f9615b5ce0b2bc84918d5fb71b63ea34a3575..88d16acc84c1c60b0bf3af0fed781f0986465625 100644 (file)
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
 PKG_VERSION:=2.2.4.6
-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 8ebf318cda5d12bafac1c0a133113b28bc481949..66b66b24380716d1ba963b9451c9a0d7bd3da406 100644 (file)
--- 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 b4a719613017f885a12d431779f8142fa74cc12a..1e55a187e473ef666a5cb707a92f9d1c4810cfdb 100755 (executable)
--- 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"