From 554fa9a34303bc65c4913f459f680e79da10bfb0 Mon Sep 17 00:00:00 2001 From: RPRX <63339210+rprx@users.noreply.github.com> Date: Sat, 29 Aug 2020 04:45:16 +0000 Subject: [PATCH] fallback -> fallbacks --- .../config_server.json | 21 ++++++++------- .../config_server.json | 10 ++++--- .../config_server.json | 27 ++++++++++--------- VLESS-TCP-TLS/config_server.json | 25 +++++++++-------- VLESS-TCP/config_server.json | 17 +++++------- VLESS-TCP/nginx.conf | 17 ------------ 6 files changed, 50 insertions(+), 67 deletions(-) diff --git a/VLESS-TCP-TLS (maximal by rprx)/config_server.json b/VLESS-TCP-TLS (maximal by rprx)/config_server.json index 73c2b46..a2eec49 100644 --- a/VLESS-TCP-TLS (maximal by rprx)/config_server.json +++ b/VLESS-TCP-TLS (maximal by rprx)/config_server.json @@ -15,14 +15,17 @@ } ], "decryption": "none", - "fallback": { - "unix": "/dev/shm/default.sock", - "xver": 1 - }, - "fallback_h2": { - "unix": "/dev/shm/h2.sock", - "xver": 1 - } + "fallbacks": [ + { + "dest": "/dev/shm/default.sock", + "xver": 1 + }, + { + "alpn": "h2", + "dest": "/dev/shm/h2.sock", + "xver": 1 + } + ] }, "streamSettings": { "network": "tcp", @@ -47,4 +50,4 @@ "protocol": "freedom" } ] -} +} \ No newline at end of file diff --git a/VLESS-TCP-TLS (minimal by rprx)/config_server.json b/VLESS-TCP-TLS (minimal by rprx)/config_server.json index 10f1d19..1641cb2 100644 --- a/VLESS-TCP-TLS (minimal by rprx)/config_server.json +++ b/VLESS-TCP-TLS (minimal by rprx)/config_server.json @@ -15,9 +15,11 @@ } ], "decryption": "none", - "fallback": { - "port": 80 - } + "fallbacks": [ + { + "dest": 80 + } + ] }, "streamSettings": { "network": "tcp", @@ -41,4 +43,4 @@ "protocol": "freedom" } ] -} +} \ No newline at end of file diff --git a/VLESS-TCP-TLS-proxy protocol/config_server.json b/VLESS-TCP-TLS-proxy protocol/config_server.json index cfd31e9..c4f001f 100644 --- a/VLESS-TCP-TLS-proxy protocol/config_server.json +++ b/VLESS-TCP-TLS-proxy protocol/config_server.json @@ -15,17 +15,18 @@ "email": "love@v2fly.org" } ], - "fallback": { - "addr": "127.0.0.1", - "port": 8001, - "xver": 1 - }, - "fallback_h2": { - "addr": "127.0.0.1", - "port": 8002, - "xver": 1 - }, - "decryption": "none" + "decryption": "none", + "fallbacks": [ + { + "dest": 8001, + "xver": 1 + }, + { + "alpn": "h2", + "dest": 8002, + "xver": 1 + } + ] }, "streamSettings": { "network": "tcp", @@ -38,8 +39,8 @@ ], "certificates": [ { - "certificateFile": "/path/to/certificate.crt", - "keyFile": "/path/to/key.key" + "certificateFile": "/path/to/fullchain.crt", + "keyFile": "/path/to/private.key" } ] } diff --git a/VLESS-TCP-TLS/config_server.json b/VLESS-TCP-TLS/config_server.json index 647e10e..8a0f82a 100644 --- a/VLESS-TCP-TLS/config_server.json +++ b/VLESS-TCP-TLS/config_server.json @@ -15,17 +15,16 @@ "email": "love@v2fly.org" } ], - "fallback": { - "addr": "127.0.0.1", - "port": 8001, - "xver": 0 - }, - "fallback_h2": { - "addr": "127.0.0.1", - "port": 8002, - "xver": 0 - }, - "decryption": "none" + "decryption": "none", + "fallbacks": [ + { + "dest": 8001 + }, + { + "alpn": "h2", + "dest": 8002 + } + ] }, "streamSettings": { "network": "tcp", @@ -38,8 +37,8 @@ ], "certificates": [ { - "certificateFile": "/path/to/certificate.crt", - "keyFile": "/path/to/key.key" + "certificateFile": "/path/to/fullchain.crt", + "keyFile": "/path/to/private.key" } ] } diff --git a/VLESS-TCP/config_server.json b/VLESS-TCP/config_server.json index 0dd816f..5b2ddf7 100644 --- a/VLESS-TCP/config_server.json +++ b/VLESS-TCP/config_server.json @@ -15,17 +15,12 @@ "email": "love@v2fly.org" } ], - "fallback": { - "addr": "127.0.0.1", - "port": 8001, - "xver": 0 - }, - "fallback_h2": { - "addr": "127.0.0.1", - "port": 8002, - "xver": 0 - }, - "decryption": "none" + "decryption": "none", + "fallbacks": [ + { + "dest": 8001 + } + ] }, "streamSettings": { "network": "tcp" diff --git a/VLESS-TCP/nginx.conf b/VLESS-TCP/nginx.conf index d04dbf4..052c25f 100644 --- a/VLESS-TCP/nginx.conf +++ b/VLESS-TCP/nginx.conf @@ -48,21 +48,4 @@ http { error_page 500 502 503 504 /50x.html; } - - server { - listen 127.0.0.1:8002 http2; - server_name yourserver_8002.com; - - charset utf-8; - - access_log logs/yourserver_8002.access.log main; - - location / { - root /var/www/html; - } - - error_page 404 /404.html; - - error_page 500 502 503 504 /50x.html; - } }