From c1939221010934614da39711f2b140b9d28712c8 Mon Sep 17 00:00:00 2001
From: xVRVx <63975481+xVRVx@users.noreply.github.com>
Date: Sat, 24 May 2025 15:37:09 +0300
Subject: [PATCH] Add files via upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Переделан роутинг
---
 autoXRAY.sh                   |  7 +++++
 autoXRAYno443.sh              | 51 ++++++++++++++++++++---------------
 autoXRAYselfsteal.sh          |  9 +++++--
 autoXRAYselfstealConfChina.sh |  9 ++-----
 autoXRAYselfstealConfRU.sh    | 27 ++++++++++++++++---
 5 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/autoXRAY.sh b/autoXRAY.sh
index e46199b..152f759 100644
--- a/autoXRAY.sh
+++ b/autoXRAY.sh
@@ -54,6 +54,13 @@ cat << 'EOF' | envsubst > "$SCRIPT_DIR/config.json"
     },
     "routing": {
         "rules": [
+            {
+                "domain": [
+                    "geosite:category-ads",
+                    "geosite:win-spy"
+                ],
+                "outboundTag": "block"
+            },
             {
                 "ip": [
                     "geoip:private"
diff --git a/autoXRAYno443.sh b/autoXRAYno443.sh
index f60a3e4..5648e48 100644
--- a/autoXRAYno443.sh
+++ b/autoXRAYno443.sh
@@ -49,28 +49,35 @@ export xray_uuid_vrv xray_dest_vrv xray_dest_vrv222 xray_privateKey_vrv xray_pub
 # Создаем JSON конфигурацию на основе шаблона и сохраняем в папку скрипта
 cat << 'EOF' | envsubst > "$SCRIPT_DIR/config.json"
 {
-  "dns": {
-	"servers": [
-		"https+local://8.8.4.4/dns-query",
-		"https+local://8.8.8.8/dns-query",
-		"localhost"
-	]
-  },
-  "log": {
-    "loglevel": "none",
-    "dnsLog": false
-  },
-  "routing": {
-    "rules": [
-      {
-        "ip": [
-          "geoip:private"
-        ],
-        "outboundTag": "block",
-        "type": "field"
-      }
-    ]
-  },
+    "dns": {
+        "servers": [
+            "https+local://8.8.4.4/dns-query",
+            "https+local://8.8.8.8/dns-query",
+            "localhost"
+        ]
+    },
+    "log": {
+        "loglevel": "none",
+        "dnsLog": false
+    },
+    "routing": {
+        "rules": [
+            {
+                "domain": [
+                    "geosite:category-ads",
+                    "geosite:win-spy"
+                ],
+                "outboundTag": "block"
+            },
+            {
+                "ip": [
+                    "geoip:private"
+                ],
+                "outboundTag": "block",
+                "type": "field"
+            }
+        ]
+    },
   "inbounds": [
     {
       "tag": "VTR$port1",
diff --git a/autoXRAYselfsteal.sh b/autoXRAYselfsteal.sh
index 870eaa3..df6d5ba 100644
--- a/autoXRAYselfsteal.sh
+++ b/autoXRAYselfsteal.sh
@@ -180,13 +180,18 @@ cat << 'EOF' | envsubst > "$SCRIPT_DIR/config.json"
         ]
     },
     "log": {
-        "access": "/var/lib/marzban/access.log",
-        "error": "/var/lib/marzban/error.log",
         "loglevel": "none",
         "dnsLog": false
     },
     "routing": {
         "rules": [
+            {
+                "domain": [
+                    "geosite:category-ads",
+                    "geosite:win-spy"
+                ],
+                "outboundTag": "block"
+            },
             {
                 "ip": [
                     "geoip:private"
diff --git a/autoXRAYselfstealConfChina.sh b/autoXRAYselfstealConfChina.sh
index 9c04056..830f0b3 100644
--- a/autoXRAYselfstealConfChina.sh
+++ b/autoXRAYselfstealConfChina.sh
@@ -306,7 +306,8 @@ cat << 'EOF' | envsubst > "$WEB_PATH/$path_subpage.html"
         "rules": [
             {
                 "domain": [
-                    "geosite:category-ads-all"
+                    "geosite:category-ads-all",
+                    "geosite:win-spy"
                 ],
                 "outboundTag": "block"
             },
@@ -316,12 +317,6 @@ cat << 'EOF' | envsubst > "$WEB_PATH/$path_subpage.html"
                 ],
                 "outboundTag": "direct"
             },
-            {
-                "ip": [
-                    "geoip:cn"
-                ],
-                "outboundTag": "direct"
-            },
             {
                 "domain": [
                     "geosite:geolocation-!cn"
diff --git a/autoXRAYselfstealConfRU.sh b/autoXRAYselfstealConfRU.sh
index cf83ef5..551124b 100644
--- a/autoXRAYselfstealConfRU.sh
+++ b/autoXRAYselfstealConfRU.sh
@@ -278,7 +278,9 @@ cat << 'EOF' | envsubst > "$WEB_PATH/$path_subpage.html"
     "dns": {
         "servers": [
             "8.8.4.4",
-            "8.8.8.8"
+            "8.8.8.8",
+            "1.1.1.1",
+            "localhost"
         ]
     },
     "routing": {
@@ -286,7 +288,8 @@ cat << 'EOF' | envsubst > "$WEB_PATH/$path_subpage.html"
         "rules": [
             {
                 "domain": [
-                    "geosite:category-ads-all"
+                    "geosite:category-ads-all",
+                    "geosite:win-spy"
                 ],
                 "outboundTag": "block"
             },
@@ -308,14 +311,21 @@ cat << 'EOF' | envsubst > "$WEB_PATH/$path_subpage.html"
                     "geosite:twitch",
                     "geosite:yandex",
                     "geosite:vk",
-                    "geosite:category-gov-ru"
+                    "geosite:microsoft",
+                    "geosite:win-update",
+                    "geosite:win-extra",
+                    "geosite:google-play",
+                    "geosite:steam",
+                    "geosite:category-ru"
                 ],
                 "outboundTag": "direct"
             },
             {
                 "ip": [
+                    "geoip:private",
                     "geoip:ru",
-                    "geoip:private"
+                    "geoip:by",
+                    "geoip:kz"
                 ],
                 "outboundTag": "direct"
             },
@@ -325,6 +335,15 @@ cat << 'EOF' | envsubst > "$WEB_PATH/$path_subpage.html"
                     "geoip:!ru"
                 ],
                 "outboundTag": "proxy"
+            },
+            {
+                "domain": [
+                    "geosite:discord",
+                    "geosite:youtube",
+                    "geosite:tiktok",
+                    "geosite:signal"
+                ],
+                "outboundTag": "proxy"
             }
         ]
     },