Merge branch 'main' into metrics-listen

This commit is contained in:
Kristoffer Dalby 2022-03-02 11:35:33 +00:00 committed by GitHub
commit b61500670c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 1094 additions and 948 deletions

View file

@ -138,7 +138,8 @@ tls_key_path: ""
log_level: info
# Path to a file containg ACL policies.
# Recommended path: /etc/headscale/acl.hujson
# ACLs can be defined as YAML or HUJSON.
# https://tailscale.com/kb/1018/acls/
acl_policy_path: ""
## DNS