From 966bf6f733163b7555c5920147610ccb2d202d23 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 25 Jun 2019 11:35:11 +0800 Subject: [PATCH] update dns config --- config/client/h2.json | 37 +++++++++++++++++++++++++++++++------ config/client/http.json | 37 +++++++++++++++++++++++++++++++------ config/client/kcp.json | 37 +++++++++++++++++++++++++++++++------ config/client/quic.json | 37 +++++++++++++++++++++++++++++++------ config/client/tcp.json | 37 +++++++++++++++++++++++++++++++------ config/client/ws.json | 37 +++++++++++++++++++++++++++++++------ config/client/ws_tls.json | 37 +++++++++++++++++++++++++++++++------ src/client_file.sh | 2 ++ v2ray.sh | 2 +- 9 files changed, 220 insertions(+), 43 deletions(-) diff --git a/config/client/h2.json b/config/client/h2.json index d0fb204..debbfac 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -35,6 +35,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -47,24 +51,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -72,6 +83,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -80,6 +98,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/config/client/http.json b/config/client/http.json index de28a84..dc92e1f 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -65,6 +65,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -77,24 +81,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -102,6 +113,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -110,6 +128,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/config/client/kcp.json b/config/client/kcp.json index 2d94f97..477dac7 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -36,6 +36,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -48,24 +52,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -73,6 +84,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -81,6 +99,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/config/client/quic.json b/config/client/quic.json index 5e6ca2d..7bef3fa 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -35,6 +35,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -47,24 +51,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -72,6 +83,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -80,6 +98,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/config/client/tcp.json b/config/client/tcp.json index 8ff30d0..96b377e 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -25,6 +25,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -37,24 +41,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -62,6 +73,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -70,6 +88,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/config/client/ws.json b/config/client/ws.json index 7f600df..3189143 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -28,6 +28,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -40,24 +44,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -65,6 +76,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -73,6 +91,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index 9281cd0..163fc51 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -38,6 +38,10 @@ "protocol": "freedom", "settings": {}, "tag": "direct" + }, + { + "protocol": "dns", + "tag": "dns-out" } ], "inbounds": [ @@ -50,24 +54,31 @@ "followRedirect": true } }, + { + "port": 2133, + "tag": "dns-in", + "protocol": "dokodemo-door", + "settings": { + "address": "127.0.0.1", + "port": 80, + "timeout": 0, + "network": "tcp,udp" + } + }, { "port": 2333, - "listen": "127.0.0.1", "protocol": "socks", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } }, { "port": 6666, - "listen": "127.0.0.1", "protocol": "http", "settings": { "auth": "noauth", - "udp": true, - "ip": "127.0.0.1" + "udp": true } } ], @@ -75,6 +86,13 @@ "servers": [ "1.1.1.1", "1.0.0.1", + { + "address": "119.29.29.29", + "port": 53, + "domains": [ + "geosite:cn" + ] + }, "8.8.8.8", "8.8.4.4", "localhost" @@ -83,6 +101,13 @@ "routing": { "domainStrategy": "IPOnDemand", "rules": [ + { + "type": "field", + "inboundTag": [ + "dns-in" + ], + "outboundTag": "dns-out" + }, { "type": "field", "ip": [ diff --git a/src/client_file.sh b/src/client_file.sh index 8bd5ddf..b47e3f7 100644 --- a/src/client_file.sh +++ b/src/client_file.sh @@ -1,3 +1,5 @@ +# vmess +_load vmess-config.sh _get_client_file() { local _link="$(cat $v2ray_client_config | tr -d [:space:] | base64 -w0)" local link="https://233boy.github.io/tools/json.html#${_link}" diff --git a/v2ray.sh b/v2ray.sh index 29878ec..2dd49d6 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.10" +_version="v3.11" cmd="apt-get"