Merge branch 'main' into patch-1

This commit is contained in:
Kristoffer Dalby 2021-11-05 18:27:55 +00:00 committed by GitHub
commit b75e8ae2bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 3473 additions and 372 deletions

View file

@ -101,18 +101,18 @@ If you used tailscale.com before in your nodes, make sure you clear the tailscal
3. In the server, register your machine to a namespace with the CLI
```shell
headscale -n myfirstnamespace nodes register YOURMACHINEKEY
headscale -n myfirstnamespace nodes register -k YOURMACHINEKEY
```
or docker:
```shell
docker run \
-v $(pwd)/config:/etc/headscale/ \
headscale/headscale:x.x.x \
headscale -n myfirstnamespace nodes register YOURMACHINEKEY
headscale -n myfirstnamespace nodes register -k YOURMACHINEKEY
```
or if your server is already running in docker:
```shell
docker exec <container_name> headscale -n myfirstnamespace nodes register YOURMACHINEKEY
docker exec <container_name> headscale -n myfirstnamespace nodes register -k YOURMACHINEKEY
```
### Alternative: adding node with AUTHKEY