zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nikki: sync upstream

Browse Source 
last commit: 9954cbfc35
This commit is contained in:
gitea-action 2025-03-15 14:30:21 +08:00
parent 3be28aaf0f
commit 33fd125c20
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nikki/files/nikki.conf
View File

@ -40,10 +40,12 @@ config proxy 'proxy'
list 'bypass_cgroup' 'adguardhome' list 'bypass_cgroup' 'adguardhome'
list 'bypass_cgroup' 'aria2' list 'bypass_cgroup' 'aria2'
list 'bypass_cgroup' 'dnsmasq' list 'bypass_cgroup' 'dnsmasq'
list 'bypass_cgroup' 'netbird'
list 'bypass_cgroup' 'nginx' list 'bypass_cgroup' 'nginx'
list 'bypass_cgroup' 'qbittorrent' list 'bypass_cgroup' 'qbittorrent'
list 'bypass_cgroup' 'tailscale' list 'bypass_cgroup' 'tailscale'
list 'bypass_cgroup' 'uhttpd' list 'bypass_cgroup' 'uhttpd'
list 'bypass_cgroup' 'zerotier'
list 'bypass_dscp' '4' list 'bypass_dscp' '4'
option 'bypass_china_mainland_ip' '0' option 'bypass_china_mainland_ip' '0'
option 'proxy_tcp_dport' '0-65535' option 'proxy_tcp_dport' '0-65535'

14
nikki/files/uci-defaults/migrate.sh
View File

@ -63,6 +63,20 @@ mixin_dns_port=$(uci -q get nikki.mixin.dns_port); [ -n "$mixin_dns_port" ] && {
uci set nikki.mixin.dns_listen=[::]:$mixin_dns_port uci set nikki.mixin.dns_listen=[::]:$mixin_dns_port
} }
# since v1.21.0
proxy_bypass_cgroup=$(uci -q get nikki.proxy.bypass_cgroup); [ -z "$proxy_bypass_cgroup" ] && {
uci add_list nikki.proxy.bypass_cgroup=adguardhome
uci add_list nikki.proxy.bypass_cgroup=aria2
uci add_list nikki.proxy.bypass_cgroup=dnsmasq
uci add_list nikki.proxy.bypass_cgroup=netbird
uci add_list nikki.proxy.bypass_cgroup=nginx
uci add_list nikki.proxy.bypass_cgroup=qbittorrent
uci add_list nikki.proxy.bypass_cgroup=tailscale
uci add_list nikki.proxy.bypass_cgroup=uhttpd
uci add_list nikki.proxy.bypass_cgroup=zerotier
}
# commit # commit
uci commit nikki uci commit nikki