From e5b538c8bd69d46c1f9baaf616ee445add2152f2 Mon Sep 17 00:00:00 2001
From: RPRX <63339210+rprx@users.noreply.github.com>
Date: Tue, 1 Sep 2020 03:39:58 +0000
Subject: [PATCH] combine

---
 .../config_server.json                        |  2 +-
 VLESS-TCP-TLS (maximal by rprx)/nginx.conf    | 23 +------------------
 VLESS-TCP-TLS-proxy protocol/nginx.conf       | 22 +++---------------
 VLESS-TCP-TLS/nginx.conf                      | 20 ++--------------
 4 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/VLESS-TCP-TLS (maximal by rprx)/config_server.json b/VLESS-TCP-TLS (maximal by rprx)/config_server.json
index a2eec49..e9912de 100644
--- a/VLESS-TCP-TLS (maximal by rprx)/config_server.json	
+++ b/VLESS-TCP-TLS (maximal by rprx)/config_server.json	
@@ -22,7 +22,7 @@
                     },
                     {
                         "alpn": "h2",
-                        "dest": "/dev/shm/h2.sock",
+                        "dest": "/dev/shm/h2c.sock",
                         "xver": 1
                     }
                 ]
diff --git a/VLESS-TCP-TLS (maximal by rprx)/nginx.conf b/VLESS-TCP-TLS (maximal by rprx)/nginx.conf
index 440e427..8b99c90 100644
--- a/VLESS-TCP-TLS (maximal by rprx)/nginx.conf	
+++ b/VLESS-TCP-TLS (maximal by rprx)/nginx.conf	
@@ -45,28 +45,7 @@ http {
 
     server {
         listen       unix:/dev/shm/default.sock proxy_protocol;
-        server_name  _;
-        root         /usr/share/nginx/html;
-
-        set_real_ip_from 127.0.0.1;
-
-        # Load configuration files for the default server block.
-        include /etc/nginx/default.d/*.conf;
-
-        location / {
-        }
-
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
-
-        error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
-        }
-    }
-
-    server {
-        listen       unix:/dev/shm/h2.sock http2 proxy_protocol;
+        listen       unix:/dev/shm/h2c.sock http2 proxy_protocol;
         server_name  _;
         root         /usr/share/nginx/html;
 
diff --git a/VLESS-TCP-TLS-proxy protocol/nginx.conf b/VLESS-TCP-TLS-proxy protocol/nginx.conf
index c9b01fd..fb15d6f 100644
--- a/VLESS-TCP-TLS-proxy protocol/nginx.conf	
+++ b/VLESS-TCP-TLS-proxy protocol/nginx.conf	
@@ -37,9 +37,10 @@ http {
 
     server {
         listen 127.0.0.1:8001 proxy_protocol;
-        server_name yourserver_8001.com;
+        listen 127.0.0.1:8002 http2 proxy_protocol;
+        server_name yourserver.com;
 
-        set_real_ip_from 192.168.1.0/24;
+        set_real_ip_from 127.0.0.1;
 
         charset utf-8;
 
@@ -53,21 +54,4 @@ http {
 
         error_page 500 502 503 504 /50x.html;
     }
-
-    server {
-        listen 127.0.0.1:8002 http2 proxy_protocol;
-        server_name yourserver_8002.com;
-
-        charset utf-8;
-
-        access_log logs/yourserver_8002.access.log proxy;
-
-        location / {
-            root /var/www/html;
-        }
-
-        error_page  404              /404.html;
-
-        error_page 500 502 503 504 /50x.html;
-    }
 }
diff --git a/VLESS-TCP-TLS/nginx.conf b/VLESS-TCP-TLS/nginx.conf
index 15d4740..c6fccb0 100644
--- a/VLESS-TCP-TLS/nginx.conf
+++ b/VLESS-TCP-TLS/nginx.conf
@@ -34,7 +34,8 @@ http {
 
     server {
         listen 127.0.0.1:8001;
-        server_name yourserver_8001.com;
+        listen 127.0.0.1:8002 http2;
+        server_name yourserver.com;
 
         charset utf-8;
 
@@ -48,21 +49,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;
-    }
 }