eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove use_username_in_magic_dns option

Browse source 
Upgrade the use of dns.use_username_in_magic_dns or
dns_config.use_username_in_magic_dns to a fatal error and remove the
option from the example configuration and integration tests.

Fixes: #2219
This commit is contained in:
Florian Preinstorfer 2024-12-11 14:33:44 +01:00 • committed by nblock
parent 697d80d5a8
commit 89a648c7dd
7 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hscontrol/types/config.go
View file

@ -322,14 +322,12 @@ func validateServerConfig() error {
depr.fatalIfNewKeyIsNotUsed("dns.nameservers.split", "dns_config.restricted_nameservers")
depr.fatalIfNewKeyIsNotUsed("dns.search_domains", "dns_config.domains")
depr.fatalIfNewKeyIsNotUsed("dns.extra_records", "dns_config.extra_records")
depr.warn("dns_config.use_username_in_magic_dns")
depr.warn("dns.use_username_in_magic_dns")
depr.fatal("dns.use_username_in_magic_dns")
depr.fatal("dns_config.use_username_in_magic_dns")
// TODO(kradalby): Reintroduce when strip_email_domain is removed
// after #2170 is cleaned up
// depr.fatal("oidc.strip_email_domain")
depr.fatal("dns.use_username_in_musername_in_magic_dns")
depr.fatal("dns_config.use_username_in_musername_in_magic_dns")
depr.Log()
@ -337,7 +335,8 @@ func validateServerConfig() error {
// TODO(kradalby): Reintroduce when strip_email_domain is removed
// after #2170 is cleaned up
// "oidc.strip_email_domain",
"dns_config.use_username_in_musername_in_magic_dns",
"dns.use_username_in_magic_dns",
"dns_config.use_username_in_magic_dns",
} {
if viper.IsSet(removed) {
log.Fatal().

1
hscontrol/types/testdata/base-domain-in-server-url.yaml vendored
View file

@ -13,4 +13,3 @@ server_url: "https://server.derp.no"
dns:
magic_dns: true
base_domain: derp.no
use_username_in_magic_dns: false

1
hscontrol/types/testdata/base-domain-not-in-server-url.yaml vendored
View file

@ -13,4 +13,3 @@ server_url: "https://derp.no"
dns:
magic_dns: true
base_domain: clients.derp.no
use_username_in_magic_dns: false

2
hscontrol/types/testdata/dns_full.yaml vendored
View file

@ -33,5 +33,3 @@ dns:
# 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

2
hscontrol/types/testdata/dns_full_no_magic.yaml vendored
View file

@ -33,5 +33,3 @@ dns:
# 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