🐶 Sync 2026-04-06 16:34:19

This commit is contained in:
github-actions[bot] 2026-04-06 16:34:19 +08:00
parent 4c8a301a9b
commit 840b4418e3
6 changed files with 7 additions and 16 deletions

View File

@ -297,6 +297,7 @@ o = s:option(ListValue, _n("flow"), translate("flow"))
o.default = ""
o:value("", translate("Disable"))
o:value("xtls-rprx-vision")
o:value("xtls-rprx-vision-udp443")
o:depends({ [_n("protocol")] = "vless" })
---- [[hysteria2]]

View File

@ -121,6 +121,7 @@ o = s:option(ListValue, _n("flow"), translate("flow"))
o.default = ""
o:value("", translate("Disable"))
o:value("xtls-rprx-vision")
o:value("xtls-rprx-vision-udp443")
o:depends({ [_n("protocol")] = "vless" })
---- [[ hysteria2 ]]

View File

@ -1461,7 +1461,7 @@ local current_node = map:get(section)
opt.set(dom_prefix + 'port', m.port || "443");
opt.set(dom_prefix + 'encryption', queryParam.encryption || "none");
opt.set(dom_prefix + 'flow', (queryParam.flow || '').replace('-udp443', ''));
opt.set(dom_prefix + 'flow', queryParam.flow || '');
if (queryParam.security) {
if (queryParam.security == "tls") {
opt.set(dom_prefix + 'tls', true);

View File

@ -1233,10 +1233,8 @@ local function processData(szType, content, add_mode, group)
result.httpupgrade_host = params.host
result.httpupgrade_path = params.path
end
result.encryption = params.encryption or "none"
result.flow = params.flow and params.flow:gsub("-udp443", "") or nil
result.flow = params.flow
result.tls = "0"
if params.security == "tls" or params.security == "reality" then

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=netdata
PKG_VERSION:=2.9.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
PKG_LICENSE:=GPL-3.0-or-later
@ -126,11 +126,9 @@ define Package/netdata/install
#netdata webdir and remove uneeded files
$(INSTALL_DIR) $(1)/usr/share/netdata
$(CP) $(PKG_INSTALL_DIR)/usr/share/netdata $(1)/usr/share
$(CP) $(1)/usr/share/netdata/web/v3/* $(1)/usr/share/netdata/web/
rm -r $(1)/usr/share/netdata/web/v3/*
rm $(1)/usr/share/netdata/build-info-cmake-cache.gz
rm $(1)/usr/share/netdata/web/v3/3D_PARTY_LICENSES.txt
rm $(1)/usr/share/netdata/web/v3/LICENSE.md
rm $(1)/usr/share/netdata/web/v3/*.LICENSE.txt
rm -r $(1)/usr/share/netdata/web/static/*
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata
$(INSTALL_DIR) $(1)/etc/config
@ -138,8 +136,6 @@ define Package/netdata/install
$(INSTALL_DIR) $(1)/etc/nginx/conf.d
$(INSTALL_DATA) ./files/netdata.locations $(1)/etc/nginx/conf.d/netdata.locations
$(INSTALL_DATA) ./files/netdata.htpasswd $(1)/etc/nginx/conf.d/netdata.htpasswd
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DATA) ./files/netdata.uci-defaults $(1)/etc/uci-defaults/luci-netdata
endef
$(eval $(call Download,netdata-dashboard))

View File

@ -1,5 +0,0 @@
#!/bin/sh
sed -i "s/initTabs();$/initTabs();loadDashboard();/" /usr/share/netdata/web/index.html
exit 0