From fe9a29dfed7dfdaf453d2ec40ef521941e9c6c3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:22:01 +0800 Subject: [PATCH] update 2023-08-03 16:22:01 --- natflow/files/natflow-user.init | 4 ++++ natflow/files/natflow.config | 2 ++ v2ray-geodata/Makefile | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/natflow/files/natflow-user.init b/natflow/files/natflow-user.init index 46caf212d..fb3cc0ba6 100644 --- a/natflow/files/natflow-user.init +++ b/natflow/files/natflow-user.init @@ -86,6 +86,10 @@ start() { echo no_flow_timeout=${no_flow_timeout} >$DEVCTL redirect_ip=$(uci get natflow.globals.redirect_ip 2>/dev/null || echo 10.10.10.10) echo redirect_ip=${redirect_ip} >$DEVCTL + https_redirect_en=$(uci get natflow.globals.https_redirect_en 2>/dev/null || echo 0) + echo https_redirect_en=${https_redirect_en} >$DEVCTL + https_redirect_port=$(uci get natflow.globals.https_redirect_port 2>/dev/null || echo 443) + echo https_redirect_port=${https_redirect_port} >$DEVCTL echo update_magic >$DEVCTL } diff --git a/natflow/files/natflow.config b/natflow/files/natflow.config index 3b7d1405f..d258b1348 100644 --- a/natflow/files/natflow.config +++ b/natflow/files/natflow.config @@ -11,6 +11,8 @@ config natflow 'main' config globals 'globals' option redirect_ip '10.10.10.1' option no_flow_timeout '1800' + option https_redirect_en '0' + option https_redirect_port '443' config auth option enabled '1' diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 5a6168878..31dbf80f4 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=53f12594c23e061745bfd3f1b626885fadcaf8b1712e9dac9ed50405ba3890a0 endef -GEOSITE_VER:=20230730120627 +GEOSITE_VER:=20230802231350 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=a771242f7982f567f77fae485de5978eb5fd89710fd099b2a26023cdd591f6ac + HASH:=61e040ce7304183d678627cd08a30de128a80263e3106b03716fb077a4c03dba endef define Package/v2ray-geodata/template