From d7ddbdb7d4681c6a0c13c941b74bd47c72cf7c14 Mon Sep 17 00:00:00 2001 From: lanthora Date: Sun, 28 Jul 2024 19:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- candy.cfg | 4 ++-- docs/guide.md | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59bbeec8..0a5db50e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.18.4) -project(candy LANGUAGES C CXX VERSION 5.10.1) +project(candy LANGUAGES C CXX VERSION 5.10.2) option(CANDY_NOEXE "Don't build executable") option(CANDY_DEVEL "Build development library") diff --git a/candy.cfg b/candy.cfg index eaed5ba0..66d67501 100644 --- a/candy.cfg +++ b/candy.cfg @@ -5,7 +5,7 @@ mode = "client" # [Required] The address for communication between the client and the server. # Server only supports ws and needs to provide wss through an external web # service. Client supports ws and wss. -websocket = "wss://canets.org/demo" +websocket = "wss://canets.org" # [Optional] Password used to verify identity # Only the hashed content of the password and timestamp is transmitted on the @@ -34,7 +34,7 @@ websocket = "wss://canets.org/demo" ################################# Client Only ################################# # [Optional] Network interface name # Used to differentiate networks when running multiple clients. -name = "demo" +#name = "" # [Optional] Static address # If dhcp is not configured, tun must be configured. When there is an address diff --git a/docs/guide.md b/docs/guide.md index c07e0980..460d1d60 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -2,9 +2,9 @@ 详细用法请参考[配置文件](https://github.com/lanthora/candy/blob/master/candy.cfg). -## 接入测试网络 +## 接入官方网络 -使用默认配置启动即可接入测试网络.客户端会缓存服务端分配的地址,并在下次启动时优先申请使用这个地址,地址保存在 `/var/lib/candy` 目录下,启动容器服务前需要在 Host 创建一个目录用于映射,否则容器重启丢失数据将导致重新分配地址. +使用默认配置启动即可接入官方网络.客户端会缓存服务端分配的地址,并在下次启动时优先申请使用这个地址,地址保存在 `/var/lib/candy` 目录下,启动容器服务前需要在 Host 创建一个目录用于映射,否则容器重启丢失数据将导致重新分配地址. 创建与容器内相同的目录以方便理解. @@ -12,13 +12,13 @@ mkdir -p /var/lib/candy ``` -以容器的方式接入测试网络 +以容器的方式接入官方网络 ```bash docker run --detach --restart=always --privileged=true --net=host --volume /var/lib/candy:/var/lib/candy docker.io/lanthora/candy:latest ``` -以 Linux 发行版 [Service](candy.service) 的方式接入测试网络 +以 Linux 发行版 [Service](candy.service) 的方式接入官方网络 ```bash systemctl enable --now candy