From 33fd125c20be6b164fabf6057c4a1cd69facb106 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Sat, 15 Mar 2025 14:30:21 +0800
Subject: [PATCH] nikki: sync upstream

last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/9954cbfc356fbfefa169dd39d019cc3c90068958
---
 nikki/files/nikki.conf              |  2 ++
 nikki/files/uci-defaults/migrate.sh | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/nikki/files/nikki.conf b/nikki/files/nikki.conf
index eeb0b89ea..3e378d2c0 100644
--- a/nikki/files/nikki.conf
+++ b/nikki/files/nikki.conf
@@ -40,10 +40,12 @@ config proxy 'proxy'
 	list 'bypass_cgroup' 'adguardhome'
 	list 'bypass_cgroup' 'aria2'
 	list 'bypass_cgroup' 'dnsmasq'
+	list 'bypass_cgroup' 'netbird'
 	list 'bypass_cgroup' 'nginx'
 	list 'bypass_cgroup' 'qbittorrent'
 	list 'bypass_cgroup' 'tailscale'
 	list 'bypass_cgroup' 'uhttpd'
+	list 'bypass_cgroup' 'zerotier'
 	list 'bypass_dscp' '4'
 	option 'bypass_china_mainland_ip' '0'
 	option 'proxy_tcp_dport' '0-65535'
diff --git a/nikki/files/uci-defaults/migrate.sh b/nikki/files/uci-defaults/migrate.sh
index 88fcc2dbc..e4a2a365a 100644
--- a/nikki/files/uci-defaults/migrate.sh
+++ b/nikki/files/uci-defaults/migrate.sh
@@ -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
 }
 
+# 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
 uci commit nikki