From 65456ed08331611213d5c6963b5d4d225bf0e852 Mon Sep 17 00:00:00 2001 From: actions Date: Fri, 19 Jul 2024 16:00:07 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/639dd48f103b3e44b0ab86fceccc6bdd986b0d49 --- .../root/usr/share/passwall/0_default_config | 33 ++++++++++++++----- patch-luci-app-passwall.patch | 2 +- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config index ed96a2f3f..25ad63822 100644 --- a/luci-app-passwall/root/usr/share/passwall/0_default_config +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config @@ -96,9 +96,9 @@ config nodes 'myshunt' option protocol '_shunt' option DirectGame '_direct' option ProxyGame '_default' + option AIGC '_default' + option Streaming '_default' option Proxy '_default' - option Netflix '_default' - option OpenAI '_default' option Direct '_direct' option default_node 'nil' option domainStrategy 'IPOnDemand' @@ -161,9 +161,28 @@ config shunt_rules 'ProxyGame' option domain_list 'geosite:category-games domain:store.steampowered.com' -config shunt_rules 'OpenAI' - option remarks 'OpenAI' - option domain_list 'geosite:openai' +config shunt_rules 'AIGC' + option remarks 'AIGC' + option domain_list 'geosite:openai +geosite:anthropic +domain:aistudio.google.com +domain:ai.google.dev +domain:gemini.google.com +domain:generativelanguage.googleapis.com +domain:makersuite.google.com +domain:alkalicore-pa.clients6.google.com +domain:alkalimakersuite-pa.clients6.google.com +domain:deepmind.com +domain:deepmind.google +domain:geller-pa.googleapis.com +domain:proactivebackend-pa.googleapis.com +domain:generativeai.google +domain:meta.ai' + +config shunt_rules 'Streaming' + option remarks 'Streaming' + option domain_list 'geosite:netflix +geosite:disney' config shunt_rules 'Proxy' option remarks 'Proxy' @@ -192,10 +211,6 @@ config shunt_rules 'Proxy' 2606:4700:4700::1111 2606:4700:4700::1001' -config shunt_rules 'Netflix' - option remarks 'Netflix' - option domain_list 'geosite:netflix' - config shunt_rules 'Direct' option remarks 'Direct' option domain_list 'geosite:cn' diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index f81bd4260..49c08c302 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -187,7 +187,7 @@ index 24662de..77b6a0b 100644 diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config -index 3ac47fb..ed96a2f 100644 +index 3addd08..25ad638 100644 --- a/luci-app-passwall/root/usr/share/passwall/0_default_config +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config @@ -32,7 +32,7 @@ config global_haproxy