From 60c917089fb616d9c071023091e40bdb1f4c12f0 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 30 Aug 2021 13:31:37 +0800 Subject: [PATCH] v2rayA: Update to 1.5.2 Refreshed init script to adapt new arguments accepted by the program. Signed-off-by: Tianling Shen --- net/v2raya/Makefile | 4 ++-- net/v2raya/files/v2raya.config | 6 +++++- net/v2raya/files/v2raya.init | 17 +++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile index d06f5feda..58dbb0e78 100644 --- a/net/v2raya/Makefile +++ b/net/v2raya/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA -PKG_VERSION:=1.5.1 +PKG_VERSION:=1.5.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=232e61b76a03f28ab48cddc314ddf445ea3c625d7983679428a1328e8e84858e +PKG_HASH:=3611b9fa5a6e0421007f2a3ce9671847ffc39e82e1caa6782eff5db470e92fe0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service PKG_LICENSE:=GPL-3.0-only diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config index 7a7926873..04b1a3f81 100644 --- a/net/v2raya/files/v2raya.config +++ b/net/v2raya/files/v2raya.config @@ -18,7 +18,11 @@ config v2raya 'config' option v2ray_bin '' # Additional v2ray config directory, files in it will be combined with config generated by v2rayA - option v2ray_config '' + option v2ray_confdir '' + + # Specify the certification path instead of automatically generating a self-signed certificate. + # Example: /etc/v2raya/grpc_certificate.crt,/etc/v2raya/grpc_private.key + option vless_grpc_inbound_cert_key '' # Print detailed v2ray-core log to stdout option verbose '0' diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init index e98ad5cd9..3a41479ae 100755 --- a/net/v2raya/files/v2raya.init +++ b/net/v2raya/files/v2raya.init @@ -18,7 +18,7 @@ is_enabled() { } append_param() { - procd_append_param command "$1" $2 + procd_append_param command "--$1" $2 } append_param_arg() { @@ -35,13 +35,14 @@ start_service() { procd_open_instance "$CONF" procd_set_param command "$PROG" - append_param_arg "config" "address" "--address" "0.0.0.0:2017" - append_param_arg "config" "config" "--config" "/etc/v2raya" - append_param_arg "config" "plugin_listen_port" "--pluginlistenport" "32346" - append_param_arg "config" "v2ray_bin" "--v2ray-bin" - append_param_arg "config" "v2ray_config" "--v2ray-config" - is_enabled "config" "force_ipv6_on" && append_param "--force_ipv6_on" - is_enabled "config" "verbose" && append_param "--verbose" + append_param_arg "config" "address" "address" "0.0.0.0:2017" + append_param_arg "config" "config" "config" "/etc/v2raya" + append_param_arg "config" "plugin_listen_port" "pluginlistenport" "32346" + append_param_arg "config" "v2ray_bin" "v2ray-bin" + append_param_arg "config" "v2ray_confdir" "v2ray-confdir" + append_param_arg "config" "vless_grpc_inbound_cert_key" "vless-grpc-inbound-cert-key" + is_enabled "config" "force_ipv6_on" && append_param "force-ipv6-on" + is_enabled "config" "verbose" && append_param "verbose" procd_set_param limits core="unlimited" procd_set_param respawn