diff --git a/change.bat b/change.bat index be78f5e..7f1a9bb 100644 --- a/change.bat +++ b/change.bat @@ -11,8 +11,8 @@ exit /b $PARAMS_FILE = "params.txt" $paths = @( - ".\conf_EE_eth\config1.json", - ".\conf_DE_eth\config1.json" + ".\conf_EE_eth\config.json", + ".\conf_DE_eth\config.json" ) # 1. Проверяем наличие файла с параметрами diff --git a/conf0/config0.json b/conf0/config.json similarity index 100% rename from conf0/config0.json rename to conf0/config.json diff --git a/conf0/s_start0.vbs b/conf0/s_start.vbs similarity index 90% rename from conf0/s_start0.vbs rename to conf0/s_start.vbs index 7dec767..b5e9281 100644 --- a/conf0/s_start0.vbs +++ b/conf0/s_start.vbs @@ -13,7 +13,7 @@ Set WshShell = CreateObject("WScript.Shell") ' bat-, ' 0 , True ( ) -WshShell.Run chr(34) & strPath & "\start0.bat" & Chr(34), 1, True +WshShell.Run chr(34) & strPath & "\start.bat" & Chr(34), 0, True Set WshShell = Nothing Set fso = Nothing diff --git a/conf_DE_WiFi/start2.bat b/conf0/start.bat similarity index 79% rename from conf_DE_WiFi/start2.bat rename to conf0/start.bat index 5a6d180..9ba5f34 100644 --- a/conf_DE_WiFi/start2.bat +++ b/conf0/start.bat @@ -3,5 +3,5 @@ cd /d "%~dp0" set ENABLE_DEPRECATED_WIREGUARD_OUTBOUND=true set ENABLE_DEPRECATED_TUN_ADDRESS_X=true set ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS=true -.\..\bin\sb.exe run -c config2.json +.\..\bin\sb.exe run -c config.json pause \ No newline at end of file diff --git a/conf_DE_WiFi/config2.json b/conf_DE_WiFi/config.json similarity index 100% rename from conf_DE_WiFi/config2.json rename to conf_DE_WiFi/config.json diff --git a/conf_DE_WiFi/config2.json.bak b/conf_DE_WiFi/config2.json.bak deleted file mode 100644 index cbf7dcb..0000000 --- a/conf_DE_WiFi/config2.json.bak +++ /dev/null @@ -1,164 +0,0 @@ -{ - "log": { - "level": "warn", - "timestamp": true - }, - "dns": { - "strategy": "ipv4_only", - "servers": [ - { - "tag": "dns-yandex", - "address": "https://77.88.8.8", // DNS - "detour": "proxy-wi-fi" - }, - { - "tag": "dns-google", - "address": "https://8.8.8.8", // Google DNS - "detour": "proxy-wi-fi", - }, - { - "tag": "dns-cloudflare", - "address": "https://1.1.1.1", // Cloudflare DNS - "detour": "proxy-vless", - "strategy": "ipv4_only" - }, - { - "tag": "dns-germany", - "address": "https://84.200.69.80", // DNS.WATCH () - "detour": "proxy-vless", - "strategy": "ipv4_only" - }, - { - "tag": "local", - "address": "local", - "detour": "direct" - }, - { - "tag": "block", - "address": "rcode://success" - } - ], - "rules": [ - { - "domain_suffix": [ - ".ru", - ".su", - ".xn--p1ai" // . - ], - "server": "dns-yandex" - }, - { - "rule_set": "geoip-ru", - "server": "dns-yandex" - }, - { - "domain_keyword": ["github"], - "server": "dns-google" - } - ], - "final": "dns-cloudflare" - }, - "inbounds": [ - { - "type": "tun", - "tag": "tun-in", - "interface_name": "sing-box-tun", - "address": [ - "172.19.0.1/30" - ], - "auto_route": true, - "strict_route": true, - "route_exclude_address": [ - "10.0.0.0/8" - ], - "stack": "gvisor", - // "mtu": 1280, - "sniff": true, - "sniff_timeout": "300ms", - "sniff_override_destination": true // - } - ], - "outbounds": [ - { - "type": "dns", - "tag": "dns-out" - }, - { - "type": "direct", - "tag": "proxy-wi-fi", - "bind_interface": "WiFi", - "domain_strategy": "ipv4_only" - }, - { - "type": "vless", - "tag": "proxy-vless", - "server": "108.165.173.226", - "server_port": 443, - "uuid": "a9f3118f-1556-48c7-932b-3911ce1aea71", - "flow": "xtls-rprx-vision", - "tls": { - "enabled": true, - "server_name": "www.sony.com", - "utls": { - "enabled": true, - "fingerprint": "chrome" - }, - "reality": { - "enabled": true, - "public_key": "_sv3AHU06_oGOy12BDGHbK22IsobtCcPdnHq7imCnFg", - "short_id": "f200" - } - }, - "packet_encoding": "xudp", - "detour": "proxy-wi-fi", - "domain_strategy": "ipv4_only" - }, - { - "type": "direct", - "tag": "direct", - //"bind_interface": "Ethernet 5", - "domain_strategy": "ipv4_only" - } - ], - "route": { - "rule_set": [ - { - "tag": "geoip-ru", - "type": "remote", - "format": "binary", - "url": "https://raw.githubusercontent.com/lyc8503/sing-box-rules/rule-set-geoip/geoip-ru.srs", - "download_detour": "proxy-wi-fi" - } - ], - "rules": [ - { - "protocol": "dns", - "action": "hijack-dns" - }, - { - "port": 53, - "outbound": "dns-out" // dns-out outbounds - }, - { - "domain_suffix": [ - ".ru", - ".su", - ".xn--p1ai" // . - ], - "outbound": "proxy-wi-fi" - }, - { - "rule_set": [ - "geoip-ru" - ], - "outbound": "proxy-wi-fi" - }, - { - "ip_cidr": ["10.0.0.0/8"], - "outbound": "direct" - } - ], - "final": "proxy-vless", - "auto_detect_interface": true - } -} \ No newline at end of file diff --git a/conf_DE_eth/s_start1.vbs b/conf_DE_WiFi/s_start.vbs similarity index 90% rename from conf_DE_eth/s_start1.vbs rename to conf_DE_WiFi/s_start.vbs index 1713833..b5e9281 100644 --- a/conf_DE_eth/s_start1.vbs +++ b/conf_DE_WiFi/s_start.vbs @@ -13,7 +13,7 @@ Set WshShell = CreateObject("WScript.Shell") ' bat-, ' 0 , True ( ) -WshShell.Run chr(34) & strPath & "\start1.bat" & Chr(34), 1, True +WshShell.Run chr(34) & strPath & "\start.bat" & Chr(34), 0, True Set WshShell = Nothing Set fso = Nothing diff --git a/conf0/start0.bat b/conf_DE_WiFi/start.bat similarity index 79% rename from conf0/start0.bat rename to conf_DE_WiFi/start.bat index 1542fc4..9ba5f34 100644 --- a/conf0/start0.bat +++ b/conf_DE_WiFi/start.bat @@ -3,5 +3,5 @@ cd /d "%~dp0" set ENABLE_DEPRECATED_WIREGUARD_OUTBOUND=true set ENABLE_DEPRECATED_TUN_ADDRESS_X=true set ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS=true -.\..\bin\sb.exe run -c config0.json +.\..\bin\sb.exe run -c config.json pause \ No newline at end of file diff --git a/conf_DE_eth/conf_old.txt b/conf_DE_eth/conf_old.txt deleted file mode 100644 index 4d1578c..0000000 --- a/conf_DE_eth/conf_old.txt +++ /dev/null @@ -1,161 +0,0 @@ -{ -  "log": { -    "level": "warn", -    "timestamp": true -  }, -  "dns": { -    "strategy": "ipv4_only", -    "servers": [ -      { -        "tag": "dns-yandex", -        "address": "https://xbox-dns.ru/dns-query", // Яндекс DNS -        "detour": "proxy-wireguard" -      }, -      { -        "tag": "dns-google", -        "address": "https://8.8.8.8",   // Google DNS -        "detour": "proxy-wireguard", -      }, -      { -        "tag": "dns-cloudflare", -        "address": "https://1.1.1.1",   // Cloudflare DNS -        "detour": "proxy-vless", -        "strategy": "ipv4_only" -      }, -      { -        "tag": "dns-germany", -        "address": "https://84.200.69.80", // DNS.WATCH (Германия) -        "detour": "proxy-vless", -        "strategy": "ipv4_only" -      }, -      { -        "tag": "local", -        "address": "local", -        "detour": "direct" -      }, -      { -        "tag": "block", -        "address": "rcode://success" -      } -    ], -    "rules": [ -      { -        "domain_suffix": [ -          ".ru", -          ".su", -          ".xn--p1ai" // это .рф -        ], -        "server": "dns-google" -      }, -      { -        "rule_set": "geoip-ru", -        "server": "dns-yandex" -      } -    ], -    "final": "dns-cloudflare" -  }, -  "inbounds": [ -    { -      "type": "tun", -      "tag": "tun-in", -      "interface_name": "sing-box-tun", -      "address": [ -        "172.19.0.1/30" -      ], -      "auto_route": true, -      "strict_route": true, -      "stack": "gvisor", -      "mtu": 1280, -      "sniff": true, -      "sniff_timeout": "300ms", -      "sniff_override_destination": true // Помогает более точно определять домены -    } -  ], -  "outbounds": [ -    { -      "type": "dns", -      "tag": "dns-out" -    }, -    { -      "type": "wireguard", -      "tag": "proxy-wireguard", -      "server": "10.13.213.230", -      "server_port": 51820, -      "local_address": [ -        "10.10.0.19/24" -      ], -      "private_key": "YPofraCnl5+cze/hCaIrsKlG+KvCoSz2PzyPb9roqk0=",  -      "peer_public_key": "9HtCros3QcKqxDelI/LSYL1GAO6jt+YlSxQsvzE2nHk=", -      "mtu": 1280, -      "domain_strategy": "ipv4_only" -    }, -    { -      "type": "vless", -      "tag": "proxy-vless", -      "server": "108.165.173.226", -      "server_port": 443, -      "uuid": "a9f3118f-1556-48c7-932b-3911ce1aea71", -      "flow": "xtls-rprx-vision", -      "tls": { -        "enabled": true, -        "server_name": "www.sony.com", -        "utls": { -          "enabled": true, -          "fingerprint": "chrome" -        }, -        "reality": { -          "enabled": true, -          "public_key": "_sv3AHU06_oGOy12BDGHbK22IsobtCcPdnHq7imCnFg", -          "short_id": "f200" -        } -      }, -      "packet_encoding": "xudp", -      "detour": "proxy-wireguard", -      "domain_strategy": "ipv4_only" -    }, -    { -      "type": "direct", -      "tag": "direct", -      "domain_strategy": "ipv4_only" -    } -  ], -  "route": { -    "rule_set": [ -      { -        "tag": "geoip-ru", -        "type": "local", -        "format": "binary", -        //"url": "https://raw.githubusercontent.com/lyc8503/sing-box-rules/rule-set-geoip/geoip-ru.srs", -        //"download_detour": "proxy-wireguard", -    "path": "./../doc/doc.srs",  -        //"update_interval": "1d" -      } -    ], -    "rules": [ -      { -        "protocol": "dns", -        "action": "hijack-dns" -      }, -      { -        "port": 53, -        "outbound": "dns-out" // Если есть dns-out в outbounds -      }, -      { -        "domain_suffix": [ -          ".ru", -          ".su", -          ".xn--p1ai" // это .рф -        ], -        "outbound": "proxy-wireguard" -      }, -      { -        "rule_set": [ -          "geoip-ru" -        ], -        "outbound": "proxy-wireguard" -      } -    ], -    "auto_detect_interface": true, -    "final": "proxy-vless" -  } -} \ No newline at end of file diff --git a/conf_DE_eth/config1.json b/conf_DE_eth/config.json similarity index 97% rename from conf_DE_eth/config1.json rename to conf_DE_eth/config.json index b1cf2c5..c0a620a 100644 --- a/conf_DE_eth/config1.json +++ b/conf_DE_eth/config.json @@ -94,9 +94,9 @@ "server": "10.13.213.230", "server_port": 51820, "local_address": [ - "YOUR ADDR" + "10.10.0.19/24" ], - "private_key": "YOUR KEY", + "private_key": "YPofraCnl5+cze/hCaIrsKlG+KvCoSz2PzyPb9roqk0=", "peer_public_key": "9HtCros3QcKqxDelI/LSYL1GAO6jt+YlSxQsvzE2nHk=", "mtu": 1280 }, diff --git a/conf_EE_WiFi/s_start2.vbs b/conf_DE_eth/s_start.vbs similarity index 90% rename from conf_EE_WiFi/s_start2.vbs rename to conf_DE_eth/s_start.vbs index e3101f0..b5e9281 100644 --- a/conf_EE_WiFi/s_start2.vbs +++ b/conf_DE_eth/s_start.vbs @@ -13,7 +13,7 @@ Set WshShell = CreateObject("WScript.Shell") ' bat-, ' 0 , True ( ) -WshShell.Run chr(34) & strPath & "\start2.bat" & Chr(34), 1, True +WshShell.Run chr(34) & strPath & "\start.bat" & Chr(34), 0, True Set WshShell = Nothing Set fso = Nothing diff --git a/conf_DE_eth/start1.bat b/conf_DE_eth/start.bat similarity index 79% rename from conf_DE_eth/start1.bat rename to conf_DE_eth/start.bat index 391fd22..9ba5f34 100644 --- a/conf_DE_eth/start1.bat +++ b/conf_DE_eth/start.bat @@ -3,5 +3,5 @@ cd /d "%~dp0" set ENABLE_DEPRECATED_WIREGUARD_OUTBOUND=true set ENABLE_DEPRECATED_TUN_ADDRESS_X=true set ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS=true -.\..\bin\sb.exe run -c config1.json +.\..\bin\sb.exe run -c config.json pause \ No newline at end of file diff --git a/conf_EE_WiFi/config2.json b/conf_EE_WiFi/config.json similarity index 100% rename from conf_EE_WiFi/config2.json rename to conf_EE_WiFi/config.json diff --git a/conf_DE_WiFi/s_start2.vbs b/conf_EE_WiFi/s_start.vbs similarity index 90% rename from conf_DE_WiFi/s_start2.vbs rename to conf_EE_WiFi/s_start.vbs index e3101f0..b5e9281 100644 --- a/conf_DE_WiFi/s_start2.vbs +++ b/conf_EE_WiFi/s_start.vbs @@ -13,7 +13,7 @@ Set WshShell = CreateObject("WScript.Shell") ' bat-, ' 0 , True ( ) -WshShell.Run chr(34) & strPath & "\start2.bat" & Chr(34), 1, True +WshShell.Run chr(34) & strPath & "\start.bat" & Chr(34), 0, True Set WshShell = Nothing Set fso = Nothing diff --git a/conf_EE_WiFi/start2.bat b/conf_EE_WiFi/start.bat similarity index 79% rename from conf_EE_WiFi/start2.bat rename to conf_EE_WiFi/start.bat index 5a6d180..9ba5f34 100644 --- a/conf_EE_WiFi/start2.bat +++ b/conf_EE_WiFi/start.bat @@ -3,5 +3,5 @@ cd /d "%~dp0" set ENABLE_DEPRECATED_WIREGUARD_OUTBOUND=true set ENABLE_DEPRECATED_TUN_ADDRESS_X=true set ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS=true -.\..\bin\sb.exe run -c config2.json +.\..\bin\sb.exe run -c config.json pause \ No newline at end of file diff --git a/conf_EE_eth/config1.json b/conf_EE_eth/config.json similarity index 97% rename from conf_EE_eth/config1.json rename to conf_EE_eth/config.json index 1c9310f..52890b2 100644 --- a/conf_EE_eth/config1.json +++ b/conf_EE_eth/config.json @@ -94,9 +94,9 @@ "server": "10.13.213.230", "server_port": 51820, "local_address": [ - "YOUR ADDR" + "10.10.0.19/24" ], - "private_key": "YOUR KEY", + "private_key": "YPofraCnl5+cze/hCaIrsKlG+KvCoSz2PzyPb9roqk0=", "peer_public_key": "9HtCros3QcKqxDelI/LSYL1GAO6jt+YlSxQsvzE2nHk=", "mtu": 1280 }, diff --git a/conf_EE_eth/s_start.vbs b/conf_EE_eth/s_start.vbs new file mode 100644 index 0000000..b5e9281 --- /dev/null +++ b/conf_EE_eth/s_start.vbs @@ -0,0 +1,19 @@ +' ( ) +If Not WScript.Arguments.Named.Exists("elevate") Then + CreateObject("Shell.Application").ShellExecute "wscript.exe", _ + """" & WScript.ScriptFullName & """ /elevate", "", "runas", 1 + WScript.Quit +End If + +' : , VBS- +Set fso = CreateObject("Scripting.FileSystemObject") +strPath = fso.GetParentFolderName(WScript.ScriptFullName) + +Set WshShell = CreateObject("WScript.Shell") + +' bat-, +' 0 , True ( ) +WshShell.Run chr(34) & strPath & "\start.bat" & Chr(34), 0, True + +Set WshShell = Nothing +Set fso = Nothing diff --git a/conf_EE_eth/s_start1.vbs b/conf_EE_eth/s_start1.vbs deleted file mode 100644 index 1713833..0000000 --- a/conf_EE_eth/s_start1.vbs +++ /dev/null @@ -1,19 +0,0 @@ -' ( ) -If Not WScript.Arguments.Named.Exists("elevate") Then - CreateObject("Shell.Application").ShellExecute "wscript.exe", _ - """" & WScript.ScriptFullName & """ /elevate", "", "runas", 1 - WScript.Quit -End If - -' : , VBS- -Set fso = CreateObject("Scripting.FileSystemObject") -strPath = fso.GetParentFolderName(WScript.ScriptFullName) - -Set WshShell = CreateObject("WScript.Shell") - -' bat-, -' 0 , True ( ) -WshShell.Run chr(34) & strPath & "\start1.bat" & Chr(34), 1, True - -Set WshShell = Nothing -Set fso = Nothing diff --git a/conf_EE_eth/start.bat b/conf_EE_eth/start.bat new file mode 100644 index 0000000..9ba5f34 --- /dev/null +++ b/conf_EE_eth/start.bat @@ -0,0 +1,7 @@ +@echo off +cd /d "%~dp0" +set ENABLE_DEPRECATED_WIREGUARD_OUTBOUND=true +set ENABLE_DEPRECATED_TUN_ADDRESS_X=true +set ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS=true +.\..\bin\sb.exe run -c config.json +pause \ No newline at end of file diff --git a/conf_EE_eth/start1.bat b/conf_EE_eth/start1.bat deleted file mode 100644 index 391fd22..0000000 --- a/conf_EE_eth/start1.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -cd /d "%~dp0" -set ENABLE_DEPRECATED_WIREGUARD_OUTBOUND=true -set ENABLE_DEPRECATED_TUN_ADDRESS_X=true -set ENABLE_DEPRECATED_SPECIAL_OUTBOUNDS=true -.\..\bin\sb.exe run -c config1.json -pause \ No newline at end of file