OpenWrt/kenzok8-package
1
0
Fork 0
mirror of https://github.com/kenzok8/small-package synced 2025-01-08 11:17:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 2024-07-18 20:34:19

Browse Source
This commit is contained in:
kenzok8 2024-07-18 20:34:19 +08:00
parent e928e629a8
commit 93dadb57e1
6 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-bmtedge/Makefile
View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20231208
PKG_VERSION:=1.0.1-20240718
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for bmtedge

4
luci-app-bmtedge/luasrc/model/bmtedge.lua
View File

@ -24,9 +24,9 @@ end
bmtedge.default_image = function()
if string.find(nixio.uname().machine, "x86_64") then
return "jinshanyun/jinshan-x86_64"
return "registry.cn-shanghai.aliyuncs.com/nsp-prod-1/public1:iaas-amd64-latest"
else
return "jinshanyun/jinshan-arm64"
return "registry.cn-shanghai.aliyuncs.com/nsp-prod-1/public1:iaas_c-arm64-latest"
end
end

6
luci-app-bmtedge/luasrc/model/cbi/bmtedge.lua
View File

@ -21,10 +21,8 @@ local default_image = bmtedge_model.default_image()
o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
o.rmempty = false
o.datatype = "string"
o:value("jinshanyun/jinshan-x86_64", "jinshanyun/jinshan-x86_64")
o:value("jinshanyun/jinshan-arm64", "jinshanyun/jinshan-arm64")
o:value("jinshanyun/jinshan-x86_64:v1.2", "jinshanyun/jinshan-x86_64:v1.2")
o:value("jinshanyun/jinshan-arm64:v2.2", "jinshanyun/jinshan-arm64:v2.2")
o:value("registry.cn-shanghai.aliyuncs.com/nsp-prod-1/public1:iaas-amd64-latest", "registry.cn-shanghai.aliyuncs.com/nsp-prod-1/public1:iaas-amd64-latest")
o:value("registry.cn-shanghai.aliyuncs.com/nsp-prod-1/public1:iaas_c-arm64-latest", "registry.cn-shanghai.aliyuncs.com/nsp-prod-1/public1:iaas_c-arm64-latest")
o.default = default_image
local default_uid = bmtedge_model.default_uid()

1
luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh
View File

@ -31,6 +31,7 @@ do_install() {
--dns=223.5.5.5 \
--tmpfs /run \
--tmpfs /tmp \
-e ksc_supplier_code=\"92101\" -e ksc_refer=\"ruiyun_node\" \
-v \"$path:/data/ksc1\" \
-v \"$path/containerd:/var/lib/containerd\" \
-e ksc_datadir=\"/data/ksc1\" \

2
luci-app-passwall2/Makefile
View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.30-2
PKG_VERSION:=1.30-3
PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \

15
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -577,13 +577,7 @@ function gen_config(var)
local xray_settings = uci:get_all(appname, "@global_xray[0]") or {}
local nodes = {}
if node_id then
local node = uci:get_all(appname, node_id)
if node then
nodes[node_id] = node
end
end
local node = node_id and uci:get_all(appname, node_id) or nil
local balancers = {}
local rules = {}
@ -774,12 +768,11 @@ function gen_config(var)
return default_outTag
end
for k, v in pairs(nodes) do
if node then
if server_host and server_port then
v.address = server_host
v.port = server_port
node.address = server_host
node.port = server_port
end
local node = v
if node.protocol == "_shunt" then
local proxy_tag = "main"
local proxy_node_id = node["main_node"]