From 39bc7bbc0b52b4b8186c4b062a0867805b9bbbb9 Mon Sep 17 00:00:00 2001 From: xubiaolin Date: Sat, 8 Feb 2025 11:50:31 +0800 Subject: [PATCH 1/3] renamefolder --- README.md | 28 +++++++++++----------- {asserts => assets}/alipay.jpg | Bin {asserts => assets}/allow_devices.png | Bin {asserts => assets}/donate.png | Bin {asserts => assets}/easy_setup.png | Bin {asserts => assets}/install_finish.png | Bin {asserts => assets}/join_net.png | Bin {asserts => assets}/nb-speed-test.png | Bin {asserts => assets}/network_addr.png | Bin {asserts => assets}/restart_service.png | Bin {asserts => assets}/service.png | Bin {asserts => assets}/wx_qrcode_pub.jpg | Bin {asserts => assets}/zerotier-network.png | Bin {asserts => assets}/ztncui.png | Bin {asserts => assets}/ztncui_create_net.png | Bin {asserts => assets}/ztncui_net_id.png | Bin 16 files changed, 14 insertions(+), 14 deletions(-) rename {asserts => assets}/alipay.jpg (100%) rename {asserts => assets}/allow_devices.png (100%) rename {asserts => assets}/donate.png (100%) rename {asserts => assets}/easy_setup.png (100%) rename {asserts => assets}/install_finish.png (100%) rename {asserts => assets}/join_net.png (100%) rename {asserts => assets}/nb-speed-test.png (100%) rename {asserts => assets}/network_addr.png (100%) rename {asserts => assets}/restart_service.png (100%) rename {asserts => assets}/service.png (100%) rename {asserts => assets}/wx_qrcode_pub.jpg (100%) rename {asserts => assets}/zerotier-network.png (100%) rename {asserts => assets}/ztncui.png (100%) rename {asserts => assets}/ztncui_create_net.png (100%) rename {asserts => assets}/ztncui_net_id.png (100%) diff --git a/README.md b/README.md index 6049bb3..945bfd2 100644 --- a/README.md +++ b/README.md @@ -77,12 +77,12 @@ 测速图如下： -图片名称 +图片名称 微信公众号：欢迎关注公众号获取最新动态和技术分享 -图片名称 +图片名称 # 1：ZeroTier 介绍 @@ -92,7 +92,7 @@ 简单来说，`ZeroTier` 就像是一个跨越互联网的"虚拟交换机"，让分布在世界各地的设备，都能像在同一个局域网内一样方便地相互访问。 -![zerotier](asserts/zerotier-network.png) +![zerotier](assets/zerotier-network.png) **ZeroTier 网络中的关键概念** @@ -219,7 +219,7 @@ cd docker-zerotier-planet 当您看到类似如下字样时，表示安装成功 -![install-finish](./asserts/install_finish.png) +![install-finish](./assets/install_finish.png) ## 3.4 下载 `planet` 文件 @@ -235,7 +235,7 @@ cd docker-zerotier-planet ## 3.5 新建网络 访问 `http://ip:3443` 进入controller页面 -![ui](asserts/ztncui.png) +![ui](assets/ztncui.png) 使用默认账号为:`admin` @@ -248,18 +248,18 @@ cd docker-zerotier-planet 创建成功后系统会自动生成一个网络ID，这个ID在后续客户端配置时会用到，请记录下来。 -![ui](asserts/ztncui_create_net.png) +![ui](assets/ztncui_create_net.png) 得到网络 `id` -![ui](asserts/ztncui_net_id.png) +![ui](assets/ztncui_net_id.png) ### 3.5.2 分配网络IP: 选中easy setup -![assign_id](./asserts/easy_setup.png) +![assign_id](./assets/easy_setup.png) 生成ip范围 -![ip_addr](./asserts/network_addr.png) +![ip_addr](./assets/network_addr.png) # 4.客户端配置 ZeroTier 支持多种主流操作系统的客户端，包括: @@ -275,11 +275,11 @@ ZeroTier 支持多种主流操作系统的客户端，包括: Win+S 搜索 `服务` -![ui](asserts/service.png) +![ui](assets/service.png) 找到ZeroTier One，并且重启服务 -![ui](asserts/restart_service.png) +![ui](assets/restart_service.png) ### 4.2 加入网络 @@ -294,11 +294,11 @@ PS C:\Windows\system32> 登录管理后台可以看到有个个新的客户端，勾选`Authorized`就行 -![ui](asserts/join_net.png) +![ui](assets/join_net.png) IP assignment 里面会出现zerotier的内网ip -![ip](./asserts/allow_devices.png) +![ip](./assets/allow_devices.png) 执行如下命令： ``` @@ -506,7 +506,7 @@ services: 如果觉得本项目对您有帮助，欢迎通过扫描下方赞赏码捐助项目 :) -donate +donate # 鸣谢 感谢以下网友投喂，你们的支持和鼓励是我不懈更新的动力 diff --git a/asserts/alipay.jpg b/assets/alipay.jpg similarity index 100% rename from asserts/alipay.jpg rename to assets/alipay.jpg diff --git a/asserts/allow_devices.png b/assets/allow_devices.png similarity index 100% rename from asserts/allow_devices.png rename to assets/allow_devices.png diff --git a/asserts/donate.png b/assets/donate.png similarity index 100% rename from asserts/donate.png rename to assets/donate.png diff --git a/asserts/easy_setup.png b/assets/easy_setup.png similarity index 100% rename from asserts/easy_setup.png rename to assets/easy_setup.png diff --git a/asserts/install_finish.png b/assets/install_finish.png similarity index 100% rename from asserts/install_finish.png rename to assets/install_finish.png diff --git a/asserts/join_net.png b/assets/join_net.png similarity index 100% rename from asserts/join_net.png rename to assets/join_net.png diff --git a/asserts/nb-speed-test.png b/assets/nb-speed-test.png similarity index 100% rename from asserts/nb-speed-test.png rename to assets/nb-speed-test.png diff --git a/asserts/network_addr.png b/assets/network_addr.png similarity index 100% rename from asserts/network_addr.png rename to assets/network_addr.png diff --git a/asserts/restart_service.png b/assets/restart_service.png similarity index 100% rename from asserts/restart_service.png rename to assets/restart_service.png diff --git a/asserts/service.png b/assets/service.png similarity index 100% rename from asserts/service.png rename to assets/service.png diff --git a/asserts/wx_qrcode_pub.jpg b/assets/wx_qrcode_pub.jpg similarity index 100% rename from asserts/wx_qrcode_pub.jpg rename to assets/wx_qrcode_pub.jpg diff --git a/asserts/zerotier-network.png b/assets/zerotier-network.png similarity index 100% rename from asserts/zerotier-network.png rename to assets/zerotier-network.png diff --git a/asserts/ztncui.png b/assets/ztncui.png similarity index 100% rename from asserts/ztncui.png rename to assets/ztncui.png diff --git a/asserts/ztncui_create_net.png b/assets/ztncui_create_net.png similarity index 100% rename from asserts/ztncui_create_net.png rename to assets/ztncui_create_net.png diff --git a/asserts/ztncui_net_id.png b/assets/ztncui_net_id.png similarity index 100% rename from asserts/ztncui_net_id.png rename to assets/ztncui_net_id.png From 94952a02429e9d01a560f8ffcb114b2b42bc3e5b Mon Sep 17 00:00:00 2001 From: Markxu <51899048+xubiaolin@users.noreply.github.com> Date: Sat, 15 Feb 2025 19:55:40 +0800 Subject: [PATCH 2/3] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 完善openwrt操作文档 --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4284f4b..7f7c9e5 100644 --- a/README.md +++ b/README.md @@ -343,10 +343,11 @@ PS C:\Windows\system32> 1. 安装zerotier客户端 2. 进入目录 `/etc/config/zero/planet` 3. 替换目录下的 `planet` 文件 -4. 在openwrt网页后台重启zerotier服务 +4. 在openwrt网页后台先关闭zerotier服务，在开启zerotier服务 5. 在openwrt网页后台加入网络 6. 管理后台同意加入请求 -7. `zerotier-cli peers` 可以看到` planet` 角色 +7. 执行 `ln -s /etc/config/zero /var/lib/zerotier-one ` +8. `zerotier-cli peers` 可以看到` planet` 角色 ## 4.6 iOS 客户端配置 方案一： From 48dc38a218555a4941e82e61f6b06ed4aa5d0e6c Mon Sep 17 00:00:00 2001 From: xubiaolin Date: Tue, 18 Feb 2025 10:31:59 +0800 Subject: [PATCH 3/3] delmirror --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 188c265..7dc1191 100755 --- a/deploy.sh +++ b/deploy.sh @@ -5,7 +5,7 @@ ZEROTIER_PATH="$(pwd)/data/zerotier" CONFIG_PATH="${ZEROTIER_PATH}/config" DIST_PATH="${ZEROTIER_PATH}/dist" ZTNCUI_PATH="${ZEROTIER_PATH}/ztncui" -DOCKER_IMAGE_THRID="docker.mirrors.imoyuapp.win/xubiaolin/zerotier-planet:latest" +DOCKER_IMAGE_THRID="xubiaolin/zerotier-planet:latest" DOCKER_IMAGE_SRC="xubiaolin/zerotier-planet:latest" DOCKER_IMAGE=$DOCKER_IMAGE_THRID print_message() {