Redo DNS configuration (#2034)
this commit changes and streamlines the dns_config into a new key, dns. It removes a combination of outdates and incompatible configuration options that made it easy to confuse what headscale could and could not do, or what to expect from ones configuration. Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
parent
022fb24cd9
commit
ac8491efec
25 changed files with 1036 additions and 453 deletions
16
hscontrol/types/testdata/base-domain-in-server-url.yaml
vendored
Normal file
16
hscontrol/types/testdata/base-domain-in-server-url.yaml
vendored
Normal file
|
@ -0,0 +1,16 @@
|
|||
noise:
|
||||
private_key_path: "private_key.pem"
|
||||
|
||||
prefixes:
|
||||
v6: fd7a:115c:a1e0::/48
|
||||
v4: 100.64.0.0/10
|
||||
|
||||
database:
|
||||
type: sqlite3
|
||||
|
||||
server_url: "https://derp.no"
|
||||
|
||||
dns:
|
||||
magic_dns: true
|
||||
base_domain: derp.no
|
||||
use_username_in_magic_dns: false
|
16
hscontrol/types/testdata/base-domain-not-in-server-url.yaml
vendored
Normal file
16
hscontrol/types/testdata/base-domain-not-in-server-url.yaml
vendored
Normal file
|
@ -0,0 +1,16 @@
|
|||
noise:
|
||||
private_key_path: "private_key.pem"
|
||||
|
||||
prefixes:
|
||||
v6: fd7a:115c:a1e0::/48
|
||||
v4: 100.64.0.0/10
|
||||
|
||||
database:
|
||||
type: sqlite3
|
||||
|
||||
server_url: "https://derp.no"
|
||||
|
||||
dns:
|
||||
magic_dns: true
|
||||
base_domain: clients.derp.no
|
||||
use_username_in_magic_dns: false
|
37
hscontrol/types/testdata/dns_full.yaml
vendored
Normal file
37
hscontrol/types/testdata/dns_full.yaml
vendored
Normal file
|
@ -0,0 +1,37 @@
|
|||
# minimum to not fatal
|
||||
noise:
|
||||
private_key_path: "private_key.pem"
|
||||
server_url: "https://derp.no"
|
||||
|
||||
dns:
|
||||
magic_dns: true
|
||||
base_domain: example.com
|
||||
|
||||
nameservers:
|
||||
global:
|
||||
- 1.1.1.1
|
||||
- 1.0.0.1
|
||||
- 2606:4700:4700::1111
|
||||
- 2606:4700:4700::1001
|
||||
- https://dns.nextdns.io/abc123
|
||||
|
||||
split:
|
||||
foo.bar.com:
|
||||
- 1.1.1.1
|
||||
darp.headscale.net:
|
||||
- 1.1.1.1
|
||||
- 8.8.8.8
|
||||
|
||||
search_domains:
|
||||
- test.com
|
||||
- bar.com
|
||||
|
||||
extra_records:
|
||||
- name: "grafana.myvpn.example.com"
|
||||
type: "A"
|
||||
value: "100.64.0.3"
|
||||
|
||||
# you can also put it in one line
|
||||
- { name: "prometheus.myvpn.example.com", type: "A", value: "100.64.0.4" }
|
||||
|
||||
use_username_in_magic_dns: true
|
37
hscontrol/types/testdata/dns_full_no_magic.yaml
vendored
Normal file
37
hscontrol/types/testdata/dns_full_no_magic.yaml
vendored
Normal file
|
@ -0,0 +1,37 @@
|
|||
# minimum to not fatal
|
||||
noise:
|
||||
private_key_path: "private_key.pem"
|
||||
server_url: "https://derp.no"
|
||||
|
||||
dns:
|
||||
magic_dns: false
|
||||
base_domain: example.com
|
||||
|
||||
nameservers:
|
||||
global:
|
||||
- 1.1.1.1
|
||||
- 1.0.0.1
|
||||
- 2606:4700:4700::1111
|
||||
- 2606:4700:4700::1001
|
||||
- https://dns.nextdns.io/abc123
|
||||
|
||||
split:
|
||||
foo.bar.com:
|
||||
- 1.1.1.1
|
||||
darp.headscale.net:
|
||||
- 1.1.1.1
|
||||
- 8.8.8.8
|
||||
|
||||
search_domains:
|
||||
- test.com
|
||||
- bar.com
|
||||
|
||||
extra_records:
|
||||
- name: "grafana.myvpn.example.com"
|
||||
type: "A"
|
||||
value: "100.64.0.3"
|
||||
|
||||
# you can also put it in one line
|
||||
- { name: "prometheus.myvpn.example.com", type: "A", value: "100.64.0.4" }
|
||||
|
||||
use_username_in_magic_dns: true
|
3
hscontrol/types/testdata/minimal.yaml
vendored
Normal file
3
hscontrol/types/testdata/minimal.yaml
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
noise:
|
||||
private_key_path: "private_key.pem"
|
||||
server_url: "https://derp.no"
|
Loading…
Add table
Add a link
Reference in a new issue