diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 00000000..230c866f --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,30 @@ +name: Nix Check + +on: + push: + branches: ["main", "develop"] + paths: + - "**/*.nix" + - "flake.lock" + pull_request: + branches: ["main", "develop"] + paths: + - "**/*.nix" + - "flake.lock" + +jobs: + check-full-shell: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Install Nix + uses: cachix/install-nix-action@v27 + with: + nix_path: nixpkgs=channel:nixos-unstable + + - name: Magic Nix Cache + uses: DeterminateSystems/magic-nix-cache-action@v6 + + - name: Check full devShell + run: nix develop .#full --command true diff --git a/README.md b/README.md index 1138966b..8b6cd7ce 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,6 @@ easytier-cli gen-autocomplete fish > ~/.config/fish/completions/easytier-cli.fis EasyTier supports quick networking using shared public nodes. When you don't have a public IP, you can use the free shared nodes provided by the EasyTier community. Nodes will automatically attempt NAT traversal and establish P2P connections. When P2P fails, data will be relayed through shared nodes. -The currently deployed shared public node is `tcp://public.easytier.cn:11010`. - When using shared nodes, each node entering the network needs to provide the same `--network-name` and `--network-secret` parameters as the unique identifier of the network. Taking two nodes as an example (Please use more complex network name to avoid conflicts): @@ -90,14 +88,14 @@ Taking two nodes as an example (Please use more complex network name to avoid co ```bash # Run with administrator privileges -sudo easytier-core -d --network-name abc --network-secret abc -p tcp://public.easytier.cn:11010 +sudo easytier-core -d --network-name abc --network-secret abc -p tcp://:11010 ``` 2. Run on Node B: ```bash # Run with administrator privileges -sudo easytier-core -d --network-name abc --network-secret abc -p tcp://public.easytier.cn:11010 +sudo easytier-core -d --network-name abc --network-secret abc -p tcp://:11010 ``` After successful execution, you can check the network status using `easytier-cli`: @@ -124,7 +122,7 @@ To improve availability, you can connect to multiple shared nodes simultaneously ```bash # Connect to multiple shared nodes -sudo easytier-core -d --network-name abc --network-secret abc -p tcp://public.easytier.cn:11010 -p udp://public.easytier.cn:11010 +sudo easytier-core -d --network-name abc --network-secret abc -p tcp://:11010 -p udp://:11010 ``` Once your network is set up successfully, you can easily configure it to start automatically on system boot. Refer to the [One-Click Register Service guide](https://easytier.cn/en/guide/network/oneclick-install-as-service.html) for step-by-step instructions on registering EasyTier as a system service. diff --git a/README_CN.md b/README_CN.md index 3b617bcc..b90560a1 100644 --- a/README_CN.md +++ b/README_CN.md @@ -79,9 +79,7 @@ easytier-cli gen-autocomplete fish > ~/.config/fish/completions/easytier-cli.fis #### 使用共享节点快速组网 -EasyTier 支持使用共享公共节点快速组网。当您没有公网 IP 时,可以使用 EasyTier 社区提供的免费共享节点。节点会自动尝试 NAT 穿透并建立 P2P 连接。当 P2P 失败时,数据将通过共享节点中继。 - -当前部署的共享公共节点是 `tcp://public.easytier.cn:11010`。 +EasyTier 支持使用共享节点快速组网。当您没有公网 IP 时,可以使用公共共享节点。节点会自动尝试 NAT 穿透并建立 P2P 连接。当 P2P 失败时,数据将通过共享节点中继。 使用共享节点时,每个进入网络的节点需要提供相同的 `--network-name` 和 `--network-secret` 参数作为网络的唯一标识符。 @@ -91,14 +89,14 @@ EasyTier 支持使用共享公共节点快速组网。当您没有公网 IP 时 ```bash # 以管理员权限运行 -sudo easytier-core -d --network-name abc --network-secret abc -p tcp://public.easytier.cn:11010 +sudo easytier-core -d --network-name abc --network-secret abc -p tcp://<共享节点IP>:11010 ``` 2. 在节点 B 上运行: ```bash # 以管理员权限运行 -sudo easytier-core -d --network-name abc --network-secret abc -p tcp://public.easytier.cn:11010 +sudo easytier-core -d --network-name abc --network-secret abc -p tcp://<共享节点IP>:11010 ``` 执行成功后,可以使用 `easytier-cli` 检查网络状态: @@ -125,7 +123,7 @@ ping 10.126.126.2 ```bash # 连接多个共享节点 -sudo easytier-core -d --network-name abc --network-secret abc -p tcp://public.easytier.cn:11010 -p udp://public.easytier.cn:11010 +sudo easytier-core -d --network-name abc --network-secret abc -p tcp://<公共节点IP>:11010 -p udp://<公共节点IP>:11010 ``` #### 去中心化组网 diff --git a/flake.lock b/flake.lock index ba7b0a61..fc64b1c6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1760409263, - "narHash": "sha256-GvcdHmY3nZnU6GnUkEG1a7pDZPgFcuN+zGv3OgvfPH0=", + "lastModified": 1770174315, + "narHash": "sha256-GUaMxDmJB1UULsIYpHtfblskVC6zymAaQ/Zqfo+13jc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5694018463c2134e2369996b38deed41b1b9afc1", + "rev": "095c394bb91342882f27f6c73f64064fb9de9f2a", "type": "github" }, "original": {