🌴 Sync 2026-09-25 21:06:58

luci-app-easytier/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 -include $(dir $(lastword $(MAKEFILE_LIST)))../version.mk
 
 PKG_VERSION:=$(or $(EASYTIER_VERSION),2.6.4)
-PKG_RELEASE:=13
+PKG_RELEASE:=14
 
 LUCI_TITLE:=LuCI support for EasyTier
 LUCI_DEPENDS:=+kmod-tun +easytier +luci-compat

luci-app-easytier/luasrc/model/cbi/easytier.lua

@@ -15,8 +15,8 @@ switch.rmempty = false
 
 etcmd = s:taboption("general", ListValue, "etcmd", translate("Startup Method"),
         translate("Official Web Console: <a href=\"https://easytier.cn/web\" target=\"_blank\">https://easytier.cn/web</a><br>"
-                .. "Official Configuration File Generator: <a href=\"https://easytier.cn/web/index.html#/config_generator\" target=\"_blank\">"
+                .. "Official Configuration File Generator: <a href=\"https://easytier.cn/assistant\" target=\"_blank\">"
-                .. "https://easytier.cn/web/index.html#/config_generator</a><br>Please note to set the RPC port to 15888"))
+                .. "https://easytier.cn/assistant</a><br>Please note to set the RPC port to 15888"))
 etcmd.default = "etcmd"
 etcmd:value("etcmd", translate("Default"))
 etcmd:value("config", translate("Configuration File"))

luci-app-easytier/po/templates/easytier.pot

@@ -613,8 +613,8 @@ msgstr ""
 msgid ""
 "Official Web Console: <a href=\"https://easytier.cn/web\" target=\"_blank"
 "\">https://easytier.cn/web</a><br>Official Configuration File Generator: <a "
-"href=\"https://easytier.cn/web/index.html#/config_generator\" target=\"_blank"
+"href=\"https://easytier.cn/assistant\" target=\"_blank"
-"\">https://easytier.cn/web/index.html#/config_generator</a><br>Please note "
+"\">https://easytier.cn/assistant</a><br>Please note "
 "to set the RPC port to 15888"
 msgstr ""
 

luci-app-easytier/po/zh_Hans/easytier.po

@@ -549,13 +549,13 @@ msgstr "官方服务器 - tcp://public.easytier.top:11010"
 msgid ""
 "Official Web Console: <a href=\"https://easytier.cn/web\" target=\"_blank"
 "\">https://easytier.cn/web</a><br>Official Configuration File Generator: <a "
-"href=\"https://easytier.cn/web/index.html#/config_generator\" target=\"_blank"
+"href=\"https://easytier.cn/assistant\" target=\"_blank"
-"\">https://easytier.cn/web/index.html#/config_generator</a><br>Please note "
+"\">https://easytier.cn/assistant</a><br>Please note "
 "to set the RPC port to 15888"
 msgstr ""
 "官方Web控制台：<a href='https://easytier.cn/web' target='_blank'>https://easytier.cn/web</a><br>"
-"官方配置文件生成器：<a href='https://easytier.cn/web/index.html#/config_generator' "
+"官方配置文件生成器：<a href='https://easytier.cn/assistant' "
-"target='_blank'>https://easytier.cn/web/index.html#/config_generator</a><br>"
+"target='_blank'>https://easytier.cn/assistant</a><br>"
 "注意配置RPC端口为15888"
 
 #: applications/luci-app-easytier/luasrc/model/cbi/easytier.lua:295

my-default-settings/Makefile

@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=my-default-settings
 PKG_VERSION:=2
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 
 include $(INCLUDE_DIR)/package.mk
 

my-default-settings/files/etc/uci-defaults/99-default-settings

@@ -97,24 +97,7 @@ if [ "$version" -lt 1 ]; then
 	version=1
 fi
 
-# 5. 默认后台域名映射与 Nginx 规则
-[ -z "$(uci -q get dhcp.default_server)" ] && uci -q batch <<-EOF
-	set dhcp.default_server=domain
-	set dhcp.default_server.name='kwrt'
-	set dhcp.default_server.ip='${lan_ip}'
-	set dhcp.default_server.comments='后台地址'
-EOF
-
 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