From abca2118e77327a9d8239f1846614b2fa6149fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 23 Jan 2024 11:57:14 +0800 Subject: [PATCH] documentation: Update geosite usage --- docs/manual/proxy/client.md | 73 +++++-------------------------------- 1 file changed, 10 insertions(+), 63 deletions(-) diff --git a/docs/manual/proxy/client.md b/docs/manual/proxy/client.md index b01fa71c..3ba7eacc 100644 --- a/docs/manual/proxy/client.md +++ b/docs/manual/proxy/client.md @@ -322,17 +322,7 @@ flowchart TB "server": "google" }, { - "type": "logical", - "mode": "and", - "rules": [ - { - "geosite": "geolocation-!cn", - "invert": true - }, - { - "geosite": "cn", - } - ], + "geosite": "geolocation-cn", "server": "local" } ] @@ -374,17 +364,7 @@ flowchart TB "server": "google" }, { - "type": "logical", - "mode": "and", - "rules": [ - { - "rule_set": "geosite-geolocation-!cn", - "invert": true - }, - { - "rule_set": "geosite-cn", - } - ], + "rule_set": "geosite-geolocation-cn", "server": "local" } ] @@ -393,15 +373,9 @@ flowchart TB "rule_set": [ { "type": "remote", - "tag": "geosite-cn", + "tag": "geosite-geolocation-cn", "format": "binary", - "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-cn.srs" - }, - { - "type": "remote", - "tag": "geosite-geolocation-!cn", - "format": "binary", - "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-!cn.srs" + "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-cn.srs" } ] } @@ -467,18 +441,7 @@ flowchart TB "outbound": "block" }, { - "type": "logical", - "mode": "and", - "rules": [ - { - "geosite": "geolocation-!cn", - "invert": true - }, - { - "geosite": "cn", - "geoip": "cn" - } - ], + "geosite": "geolocation-cn", "outbound": "direct" } ] @@ -545,19 +508,9 @@ flowchart TB "outbound": "block" }, { - "type": "logical", - "mode": "and", - "rules": [ - { - "rule_set": "geosite-geolocation-!cn", - "invert": true - }, - { - "rule_set": [ - "geoip-cn", - "geosite-cn" - ] - } + "rule_set": [ + "geoip-cn", + "geosite-geolocation-cn" ], "outbound": "direct" } @@ -571,15 +524,9 @@ flowchart TB }, { "type": "remote", - "tag": "geosite-cn", + "tag": "geosite-geolocation-cn", "format": "binary", - "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-cn.srs" - }, - { - "type": "remote", - "tag": "geosite-geolocation-!cn", - "format": "binary", - "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-!cn.srs" + "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-geolocation-cn.srs" } ] }