Merge branch 'main' into changelog

This commit is contained in:
Kristoffer Dalby 2021-12-04 12:16:01 +00:00 committed by GitHub
commit 58ec26ee89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View file

@ -6,6 +6,10 @@ server_url: http://127.0.0.1:8080
# Address to listen to / bind to on the server
listen_addr: 0.0.0.0:8080
# Private key file which will be
# autogenerated if it's missing
private_key_path: private.key
derp:
# List of externally available DERP maps encoded in JSON
urls:

View file

@ -28,7 +28,7 @@ derp_map_path: derp.yaml
`derp_map_path` is the path to the [DERP](https://pkg.go.dev/tailscale.com/derp) map file. If the path is relative, it will be interpreted as relative to the directory the configuration file was read from.
```yaml
ephemeral_node_inactivity_timeout": "30m"
ephemeral_node_inactivity_timeout: "30m"
```
`ephemeral_node_inactivity_timeout` is the timeout after which inactive ephemeral node records will be deleted from the database. The default is 30 minutes. This value must be higher than 65 seconds (the keepalive timeout for the HTTP long poll is 60 seconds, plus a few seconds to avoid race conditions).