Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use headscale server url as domain instead of base_domain #2338

Merged
merged 1 commit into from
Jan 16, 2025

Conversation

kradalby
Copy link
Collaborator

@kradalby kradalby commented Jan 10, 2025

Fixes #2336
Closes #2344
Closes #2318

@kradalby kradalby requested a review from juanfont as a code owner January 10, 2025 07:26
Fixes juanfont#2336

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
@kradalby kradalby force-pushed the kradalby/2336-display-server branch from 672359d to e57b1a1 Compare January 10, 2025 07:28
@valkum
Copy link

valkum commented Jan 14, 2025

Possible duplicate of #2344 (had the work lying around but didn't create a PR yet). I think my PR is more complete, as the DNS base domain is completely separate from the org base domain in tailscale.

@kradalby
Copy link
Collaborator Author

I was just going to post on yours, I do not think it should be based on the base domain at all, so I do not think introducing another layer of config and falling back to the wrong one is the ideal setup.

Since Headscale support one tailnet, I think using the name of the server makes more sense. the naming of base_name is already confusing enough and introducing a second one would not help I believe.

@valkum
Copy link

valkum commented Jan 15, 2025

The fallback is just for a transitional period. It can be removed in an upcoming version.
I want to use different values. e.g. hs.my-domain.com as the headscale hostname and my-domain.com as the org domain, but the magic DNS base domain should be my-domain.net.

@kradalby
Copy link
Collaborator Author

kradalby commented Jan 15, 2025

the problem isnt the fallback, its adding more configuration options, we are increasingly getting more strict as there are has previously been added two many knobs making it hard for us to move forward without making anger. In this case we will continue to go for less configurability and defaults based on what we think are best practices.

@kradalby kradalby merged commit e4a3dcc into juanfont:main Jan 16, 2025
137 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Domain" to display in GUI applications [Bug] headscale uses cfg.BaseDomain for building FQDNs
3 participants