cwx/op-packages
1
0
Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-09-14 04:15:06 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

🎉 Sync 2026-05-08 08:37:16

Browse Source
This commit is contained in:
github-actions[bot]
2026-05-08 08:37:16 +08:00
parent 8ab3d7cd74
commit dc55b8fdfe
7 changed files with 1244 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
luci-app-passwall/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.5.3
PKG_RELEASE:=115
PKG_RELEASE:=116
PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \
luci-app-passwall/luasrc/passwall/util_xray.lua
+13 -13
View File
@@ -465,9 +465,9 @@ function gen_config_server(node)
if node.protocol == "vmess" or node.protocol == "vless" then
if node.uuid then
local clients = {}
local users = {}
for i = 1, #node.uuid do
clients[i] = {
users[i] = {
id = node.uuid[i],
flow = (node.protocol == "vless"
and (node.tls == "1" or (node.decryption and node.decryption ~= "" and node.decryption ~= "none"))
@@ -475,7 +475,7 @@ function gen_config_server(node)
}
end
settings = {
clients = clients,
users = users,
decryption = (node.protocol == "vless") and ((node.decryption and node.decryption ~= "") and node.decryption or "none") or nil
}
end
@@ -483,7 +483,7 @@ function gen_config_server(node)
settings = {
udp = ("1" == node.udp_forward) and true or false,
auth = ("1" == node.auth) and "password" or "noauth",
accounts = ("1" == node.auth) and {
users = ("1" == node.auth) and {
{
user = node.username,
pass = node.password
@@ -493,7 +493,7 @@ function gen_config_server(node)
elseif node.protocol == "http" then
settings = {
allowTransparent = false,
accounts = ("1" == node.auth) and {
users = ("1" == node.auth) and {
{
user = node.username,
pass = node.password
@@ -511,20 +511,20 @@ function gen_config_server(node)
}
elseif node.protocol == "trojan" then
if node.uuid then
local clients = {}
local users = {}
for i = 1, #node.uuid do
clients[i] = {
users[i] = {
password = node.uuid[i],
}
end
settings = {
clients = clients
users = users
}
end
elseif node.protocol == "hysteria2" then
settings = {
version = 2,
clients = node.hysteria2_auth_password and {
users = node.hysteria2_auth_password and {
{ auth = node.hysteria2_auth_password }
}
}
@@ -888,7 +888,7 @@ function gen_config(var)
end
if local_socks_username and local_socks_password and local_socks_username ~= "" and local_socks_password ~= "" then
inbound.settings.auth = "password"
inbound.settings.accounts = {
inbound.settings.users = {
{
user = local_socks_username,
pass = local_socks_password
@@ -905,7 +905,7 @@ function gen_config(var)
settings = {allowTransparent = false}
}
if local_http_username and local_http_password and local_http_username ~= "" and local_http_password ~= "" then
inbound.settings.accounts = {
inbound.settings.users = {
{
user = local_http_username,
pass = local_http_password
@@ -1963,7 +1963,7 @@ function gen_proto_config(var)
}
if local_socks_username and local_socks_password and local_socks_username ~= "" and local_socks_password ~= "" then
inbound.settings.auth = "password"
inbound.settings.accounts = {
inbound.settings.users = {
{
user = local_socks_username,
pass = local_socks_password
@@ -1983,7 +1983,7 @@ function gen_proto_config(var)
}
}
if local_http_username and local_http_password and local_http_username ~= "" and local_http_password ~= "" then
inbound.settings.accounts = {
inbound.settings.users = {
{
user = local_http_username,
pass = local_http_password