From ae0470cbaff1c2312ef7cbd864b0ec103f4c8d5f Mon Sep 17 00:00:00 2001
From: lwch <lwch748@gmail.com>
Date: Sat, 9 Oct 2021 15:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/client.yaml | 3 +--
 conf/server.yaml | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/client.yaml b/conf/client.yaml
index 52090ec..159fc3b 100644
--- a/conf/client.yaml
+++ b/conf/client.yaml
@@ -1,6 +1,5 @@
 id: this               # 客户端ID
 server: 127.0.0.1:6154 # 服务器地址
-#include conf.d/connection.yaml
-#include conf.d/log.yaml
+#include conf.d/*.yaml
 tunnel: # tunnel列表
   #include tunnel.d/*.yaml
\ No newline at end of file
diff --git a/conf/server.yaml b/conf/server.yaml
index c27a2f0..36a9d5c 100644
--- a/conf/server.yaml
+++ b/conf/server.yaml
@@ -1,4 +1,5 @@
 listen: 6154 # 监听端口号
+#include conf.d/*.yaml
 tls:
   key: /dir/to/tls/key/file # tls密钥
   crt: /dir/to/tls/crt/file # tls证书
\ No newline at end of file