From db4b81048a516df5c5336e8d78ac473f9c9df726 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 23 Jun 2019 22:22:33 +0800 Subject: [PATCH] support padavan v2ray --- config/client/h2.json | 43 +++++++++++++++------------------------ config/client/http.json | 43 +++++++++++++++------------------------ config/client/kcp.json | 43 +++++++++++++++------------------------ config/client/quic.json | 43 +++++++++++++++------------------------ config/client/tcp.json | 43 +++++++++++++++------------------------ config/client/ws.json | 43 +++++++++++++++------------------------ config/client/ws_tls.json | 43 +++++++++++++++------------------------ v2ray.sh | 2 +- 8 files changed, 113 insertions(+), 190 deletions(-) diff --git a/config/client/h2.json b/config/client/h2.json index 73d634d..d0fb204 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -42,6 +38,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -65,6 +70,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -76,34 +83,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/config/client/http.json b/config/client/http.json index 563164a..de28a84 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -72,6 +68,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -95,6 +100,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -106,34 +113,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/config/client/kcp.json b/config/client/kcp.json index c386ca0..2d94f97 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -43,6 +39,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -66,6 +71,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -77,34 +84,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/config/client/quic.json b/config/client/quic.json index 98487f6..5e6ca2d 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -42,6 +38,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -65,6 +70,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -76,34 +83,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/config/client/tcp.json b/config/client/tcp.json index 25adf4a..8ff30d0 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -32,6 +28,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -55,6 +60,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -66,34 +73,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/config/client/ws.json b/config/client/ws.json index c062444..7f600df 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -35,6 +31,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -58,6 +63,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -69,34 +76,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index 048924f..9281cd0 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -1,8 +1,4 @@ { - "log": { - "error": "error.log", - "loglevel": "warning" - }, "outbounds": [ { "protocol": "vmess", @@ -45,6 +41,15 @@ } ], "inbounds": [ + { + "port": "1099", + "protocol": "dokodemo-door", + "settings": { + "network": "tcp,udp", + "timeout": 0, + "followRedirect": true + } + }, { "port": 2333, "listen": "127.0.0.1", @@ -68,6 +73,8 @@ ], "dns": { "servers": [ + "1.1.1.1", + "1.0.0.1", "8.8.8.8", "8.8.4.4", "localhost" @@ -79,34 +86,16 @@ { "type": "field", "ip": [ - "0.0.0.0/8", - "10.0.0.0/8", - "100.64.0.0/10", - "127.0.0.0/8", - "169.254.0.0/16", - "172.16.0.0/12", - "192.0.0.0/24", - "192.0.2.0/24", - "192.168.0.0/16", - "198.18.0.0/15", - "198.51.100.0/24", - "203.0.113.0/24", - "::1/128", - "fc00::/7", - "fe80::/10", + "geoip:private", "geoip:cn" ], - "domain": [ - "geosite:cn" - ], "outboundTag": "direct" }, { - "type": "chinasites", - "outboundTag": "direct" - }, - { - "type": "chinaip", + "type": "field", + "domain": [ + "geosite:cn" + ], "outboundTag": "direct" } ] diff --git a/v2ray.sh b/v2ray.sh index ba91a3a..29878ec 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.09" +_version="v3.10" cmd="apt-get"