Add files via upload

lxhao61 · Aug 6, 2023 · b14a483 · b14a483
1 parent c51cbd9
commit b14a483
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/Xray(VLESS+Vision+TLS)+Caddy/1_caddy.json b/Xray(VLESS+Vision+TLS)+Caddy/1_caddy.json
@@ -1,15 +1,21 @@
 {
   "admin": {
-    "disabled": true
+    "disabled": true,
+    "config": {
+      "persist": false
+    }
   },
   "logging": {
     "logs": {
       "default": {
         "writer": {
           "output": "file",
-          "filename": "/var/log/caddy/error.log"
+          "filename": "/var/log/caddy/default.log"
+        },
+        "encoder": {
+          "format": "console"
         },
-        "level": "ERROR"
+        "level": "WARN"
       }
     }
   },
@@ -20,7 +26,7 @@
   "apps": {
     "http": {
       "servers": {
-        "h1": {
+        "srvh1": {
           "listen": [":80"],
           "routes": [{
             "handle": [{
@@ -30,9 +36,10 @@
               },
               "status_code": 301
             }]
-          }]
+          }],
+          "protocols": ["h1"] //仅开启HTTP/1.1 server支持
         },
-        "h1h2c": {
+        "srvh2c": {
           "listen": ["127.0.0.1:88"], //H2C server及HTTP/1.1 server本地监听端口
           "listener_wrappers": [{
             "wrapper": "proxy_protocol" //开启PROXY protocol接收

diff --git a/Xray(VLESS+Vision+TLS)+Caddy/2_caddy.json b/Xray(VLESS+Vision+TLS)+Caddy/2_caddy.json
@@ -1,15 +1,21 @@
 {
   "admin": {
-    "disabled": true
+    "disabled": true,
+    "config": {
+      "persist": false
+    }
   },
   "logging": {
     "logs": {
       "default": {
         "writer": {
           "output": "file",
-          "filename": "/var/log/caddy/error.log"
+          "filename": "/var/log/caddy/default.log"
+        },
+        "encoder": {
+          "format": "console"
         },
-        "level": "ERROR"
+        "level": "WARN"
       }
     }
   },
@@ -20,7 +26,7 @@
   "apps": {
     "http": {
       "servers": {
-        "h1": {
+        "srvh1": {
           "listen": [":80"],
           "routes": [{
             "handle": [{
@@ -30,9 +36,10 @@
               },
               "status_code": 301
             }]
-          }]
+          }],
+          "protocols": ["h1"] //仅开启HTTP/1.1 server支持
         },
-        "h1h2c": {
+        "srvh2c": {
           "listen": ["unix/@h1h2c.sock"], //H2C server及HTTP/1.1 server监听进程
           "listener_wrappers": [{
             "wrapper": "proxy_protocol" //开启PROXY protocol接收

diff --git a/Xray(VLESS+Vision+TLS)+Caddy/README.md b/Xray(VLESS+Vision+TLS)+Caddy/README.md
@@ -13,7 +13,7 @@
 
 2、Caddy 支持 H2C server 与 HTTP/1.1 server 共用一个端口或一个进程。
 
-3、Caddy 版本不小于 v2.6.5 才默认支持 PROXY protocol 接收。若 Caddy 版本小于 v2.6.5 需加 caddy2-proxyprotocol 插件定制编译才支持 PROXY protocol 接收。
+3、Caddy 版本不小于 v2.7.0 才默认支持 PROXY protocol 接收。若 Caddy 版本小于 v2.7.0 需加 caddy2-proxyprotocol 插件定制编译才支持 PROXY protocol 接收。
 
 4、本示例所需 TLS 证书由 Caddy（内置 ACME 客户端） 提供，实现 TLS 证书自动申请及更新。