From aedca03bf3da88bb30b7ed0f29212e6a34c054f2 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Fri, 14 Mar 2025 20:39:02 +0800 Subject: [PATCH] update 2025-03-14 20:39:02 --- luci-app-godproxy/Makefile | 2 +- luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy | 2 ++ .../{luci-app-godproxy.json => luci-app-ikoolproxy.json} | 4 ++-- .../root/usr/share/ucitrack/luci-app-ikoolproxy.json | 4 ++++ luci-app-ikoolproxy/Makefile | 2 +- luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy | 2 ++ .../root/usr/share/ucitrack/luci-app-ikoolproxy.json | 4 ++++ 7 files changed, 16 insertions(+), 4 deletions(-) rename luci-app-godproxy/root/usr/share/rpcd/acl.d/{luci-app-godproxy.json => luci-app-ikoolproxy.json} (51%) create mode 100644 luci-app-godproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json create mode 100644 luci-app-ikoolproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json diff --git a/luci-app-godproxy/Makefile b/luci-app-godproxy/Makefile index ede4e0e0f..ea597e310 100644 --- a/luci-app-godproxy/Makefile +++ b/luci-app-godproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20240610 +PKG_RELEASE:=20250314 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy b/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy index 85d7f421c..9f62abdf7 100755 --- a/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy +++ b/luci-app-godproxy/root/etc/uci-defaults/luci-koolproxy @@ -1,10 +1,12 @@ #!/bin/sh uci -q batch <<-EOF >/dev/null + [ -e "/etc/config/ucitrack" ] && { delete ucitrack.@koolproxy[-1] add ucitrack koolproxy set ucitrack.@koolproxy[-1].init=koolproxy commit ucitrack + } delete firewall.koolproxy set firewall.koolproxy=include set firewall.koolproxy.type=script diff --git a/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-godproxy.json b/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json similarity index 51% rename from luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-godproxy.json rename to luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json index a2c0003a7..daf398aff 100644 --- a/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-godproxy.json +++ b/luci-app-godproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json @@ -1,6 +1,6 @@ { - "luci-app-godproxy": { - "description": "Grant UCI access for luci-app-godproxy", + "luci-app-ikoolproxy": { + "description": "Grant UCI access for luci-app-ikoolproxy", "read": { "uci": [ "koolproxy" ] }, diff --git a/luci-app-godproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json b/luci-app-godproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json new file mode 100644 index 000000000..ae16823e8 --- /dev/null +++ b/luci-app-godproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json @@ -0,0 +1,4 @@ +{ + "config": "koolproxy", + "init": "koolproxy" +} diff --git a/luci-app-ikoolproxy/Makefile b/luci-app-ikoolproxy/Makefile index ede4e0e0f..ea597e310 100644 --- a/luci-app-ikoolproxy/Makefile +++ b/luci-app-ikoolproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20240610 +PKG_RELEASE:=20250314 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy b/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy index 85d7f421c..9f62abdf7 100755 --- a/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy +++ b/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy @@ -1,10 +1,12 @@ #!/bin/sh uci -q batch <<-EOF >/dev/null + [ -e "/etc/config/ucitrack" ] && { delete ucitrack.@koolproxy[-1] add ucitrack koolproxy set ucitrack.@koolproxy[-1].init=koolproxy commit ucitrack + } delete firewall.koolproxy set firewall.koolproxy=include set firewall.koolproxy.type=script diff --git a/luci-app-ikoolproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json b/luci-app-ikoolproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json new file mode 100644 index 000000000..ae16823e8 --- /dev/null +++ b/luci-app-ikoolproxy/root/usr/share/ucitrack/luci-app-ikoolproxy.json @@ -0,0 +1,4 @@ +{ + "config": "koolproxy", + "init": "koolproxy" +}