From c8f9c09b0a0398a17d2895598e1d29673e76cc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E7=BF=94=E5=AE=87?= Date: Thu, 23 Jun 2022 07:34:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E4=BA=8EMacOS?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=93=8D=E4=BD=9C=E7=9A=84=E6=95=99?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index a6f553e..9fa97dd 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,15 @@ PS C:\Windows\system32> ## 4.3 安卓客户端配置 [Zerotier 非官方安卓客户端发布：支持自建 Moon 节点 - V2EX](https://www.v2ex.com/t/768628) +## 4.4 MacOS 客户端配置 +步骤如下： + +1. 进入 `/Library/Application\ Support/ZeroTier/One/` 目录，并替换目录下的 `planet` 文件 +2. 重启 ZeroTier-One：`cat /Library/Application\ Support/ZeroTier/One/zerotier-one.pid | sudo xargs kill` +3. 加入网络 `zerotier-cli join` 网络 `id` +4. 管理后台同意加入请求 +5. `zerotier-cli peers` 可以看到` planet` 角色 + # 参考链接 [zerotier-虚拟局域网详解](https://www.glimmer.ltd/2021/3299983056/) From 9a169169255a0ada8f66ec7eb3fe6f022ae9b127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E7=BF=94=E5=AE=87?= Date: Thu, 23 Jun 2022 07:44:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmkworld=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 先前直接Build时，会出现：`../../osdep/OSUtils.hpp:46:10: fatal error: nlohmann/json.hpp: No such file or directory` 的问题，造成最后并没有编译出正确的planet的问题； 此外，直接使用 wget 往 `/usr/include` 下塞东西确实不够优雅，但是不知道为啥 `apt install nlohmann-json-dev` 是 missing 的，考虑到这块后续也不会有啥变化，就是用了这种比较简单直接的方式 --- init.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/init.sh b/init.sh index d9f1d49..edc0d32 100755 --- a/init.sh +++ b/init.sh @@ -19,7 +19,11 @@ dpkg-reconfigure --frontend noninteractive tzdata rm -rf /var/lib/apt/lists/* apt update -apt install git python3 npm make curl -y +apt install git python3 npm make curl wget -y + +mkdir /usr/include/nlohmann/ +cd /usr/include/nlohmann/ && wget https://github.com/nlohmann/json/releases/download/v3.10.5/json.hpp + npm config set registry http://registry.npm.taobao.org && npm install -g node-gyp curl -s https://install.zerotier.com | bash cd /opt && git clone -v http://gh-proxy.markxu.vip/https://github.com/key-networks/ztncui.git