From 6ed0551f38489494018bd01180c795be56385e63 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 27 Sep 2026 00:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Sync=202026-09-27=2000:38:48?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 luci-app-passwall/Makefile                                | 2 +-
 luci-app-passwall/root/usr/share/passwall/subscribe.lua   | 7 +------
 my-default-settings/Makefile                              | 2 +-
 .../files/etc/uci-defaults/99-default-settings            | 8 ++++++++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index 083ec34b4..97bcf9b58 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.9.26
-PKG_RELEASE:=294
+PKG_RELEASE:=295
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index 0c8b7fea4..98ade6ff7 100755
--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -1426,6 +1426,7 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 		result.hysteria_auth_type = "string"
 		result.hysteria_auth_password = params.auth
 		result.tls_serverName = params.peer or params.sni or ""
+		result.tls_pinSHA256 = params.pcs or params.pinSHA256
 		local insecure = params.allowinsecure or params.allowInsecure or params.insecure
 		result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0")
 		result.alpn = params.alpn
@@ -1493,14 +1494,8 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 			result.protocol = "hysteria2"
 			result.use_finalmask = (params.fm and params.fm ~= "") and "1" or nil
 			result.finalmask = (params.fm and params.fm ~= "") and api.base64Encode(params.fm) or nil
-			if is_singbox and (params.pcs or params.pinsha256) then
-				params.allowinsecure = "1"
-			end
 		elseif has_hysteria2 then
 			result.type = "Hysteria2"
-			if params.pcs or params.pinsha256 then
-				params.allowinsecure = "0"
-			end
 		else
 			log("跳过 Hysteria2 节点，因未适配到 Hysteria2 核心程序，或未正确设置节点使用类型。")
 			return nil
diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile
index 18b467ff7..aa961ba64 100644
--- a/my-default-settings/Makefile
+++ b/my-default-settings/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=my-default-settings
 PKG_VERSION:=2
-PKG_RELEASE:=22
+PKG_RELEASE:=23
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/my-default-settings/files/etc/uci-defaults/99-default-settings b/my-default-settings/files/etc/uci-defaults/99-default-settings
index ac69adc1d..b51337ea0 100644
--- a/my-default-settings/files/etc/uci-defaults/99-default-settings
+++ b/my-default-settings/files/etc/uci-defaults/99-default-settings
@@ -98,6 +98,14 @@ if [ "$version" -lt 1 ]; then
 fi
 
 if command -v nginx >/dev/null 2>&1; then
+	[ -z "$(uci -q get nginx.default_server)" ] && uci -q batch <<-EOF
+		set nginx.default_server=server
+		set nginx.default_server.server_name='kwrt'
+		add_list nginx.default_server.listen='80 default_server'
+		add_list nginx.default_server.listen='[::]:80 default_server'
+		add_list nginx.default_server.include='conf.d/*.locations'
+		set nginx.default_server.access_log='off; # logd openwrt'
+	EOF
 	if [ -f /etc/nginx/conf.d/luci.locations ]; then
 		grep -q 'uwsgi_read_timeout' /etc/nginx/conf.d/luci.locations || sed -i '/include uwsgi_params;/a\\t\tuwsgi_read_timeout 300s;' /etc/nginx/conf.d/luci.locations
 		grep -q 'ubus_script_timeout' /etc/nginx/conf.d/luci.locations || sed -i '/ubus_parallel_req/a\        ubus_script_timeout 600;' /etc/nginx/conf.d/luci.locations