starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-01-14 05:03:28 +01:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

[PR #174] [MERGED] Fix MagicDNS base domain #1299

New Issue
Closed
opened 2025-12-29 02:29:36 +01:00 by adam · 0 comments
adam commented 2025-12-29 02:29:36 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/174
Author: @juanfont
Created: 10/17/2021
Status: ✅ Merged
Merged: 10/18/2021
Merged by: @juanfont

Base: main ← Head: fix-magic-dns-base-domain

📝 Commits (7)

  • 061efa1 Do not include BaseDomain as full route in DNSConfig + code reorg
  • 8094e6f Preload the Namespace from SharedMachines
  • 01f755e Send UserProfile info for the peers' namespaces
  • 687e8d1 Do not use the full application for getMapResponseDNSConfig
  • ddf042c Merge branch 'main' into fix-magic-dns-base-domain
  • 01a5fe3 Added tests, solved some bugs, and code reorg
  • 37e191a Solved merge

📊 Changes

6 files changed (+424 additions, -24 deletions)

View changed files

📝 api.go (+10 -15)
📝 dns.go (+25 -6)
📝 dns_test.go (+244 -1)
📝 machine.go (+2 -2)
📝 namespaces.go (+19 -0)
📝 namespaces_test.go (+124 -0)

📄 Description

This PR fixes #160, by only including as routed DNS domains those of the namespaces handled by Headscale.

It also improves the way tailscale status reports the namespaces of the shared machines by sending the correct list of tailcfg.UserProfile.

Also, some code cleanup.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/174 **Author:** [@juanfont](https://github.com/juanfont) **Created:** 10/17/2021 **Status:** ✅ Merged **Merged:** 10/18/2021 **Merged by:** [@juanfont](https://github.com/juanfont) **Base:** `main` ← **Head:** `fix-magic-dns-base-domain` --- ### 📝 Commits (7) - [`061efa1`](https://github.com/juanfont/headscale/commit/061efa182239fb962acca74e41e90d645a84a654) Do not include BaseDomain as full route in DNSConfig + code reorg - [`8094e6f`](https://github.com/juanfont/headscale/commit/8094e6fdef67ca683afc27208ca578a4422f9b67) Preload the Namespace from SharedMachines - [`01f755e`](https://github.com/juanfont/headscale/commit/01f755ecf90b6ecd65ef7fc29f770e59575b0cfc) Send UserProfile info for the peers' namespaces - [`687e8d1`](https://github.com/juanfont/headscale/commit/687e8d12bec677f947d2f9d3162b622d3bb4c9a9) Do not use the full application for getMapResponseDNSConfig - [`ddf042c`](https://github.com/juanfont/headscale/commit/ddf042cab12f539a41038db87ca1567f8105bbf5) Merge branch 'main' into fix-magic-dns-base-domain - [`01a5fe3`](https://github.com/juanfont/headscale/commit/01a5fe3c51ea926e18eaf7a98dd11102513fcf7a) Added tests, solved some bugs, and code reorg - [`37e191a`](https://github.com/juanfont/headscale/commit/37e191a75dec3351ea12a083afe70014aa3b411d) Solved merge ### 📊 Changes **6 files changed** (+424 additions, -24 deletions) <details> <summary>View changed files</summary> 📝 `api.go` (+10 -15) 📝 `dns.go` (+25 -6) 📝 `dns_test.go` (+244 -1) 📝 `machine.go` (+2 -2) 📝 `namespaces.go` (+19 -0) 📝 `namespaces_test.go` (+124 -0) </details> ### 📄 Description This PR fixes #160, by only including as routed DNS domains those of the namespaces handled by Headscale. It also improves the way `tailscale status` reports the namespaces of the shared machines by sending the correct list of `tailcfg.UserProfile`. Also, some code cleanup. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 02:29:36 +01:00
adam closed this issue 2025-12-29 02:29:36 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
CLI
DERP
DNS
Nix
OIDC
SSH
bug
database
documentation
duplicate
enhancement
faq
good first issue
grants
help wanted
might-come
needs design doc
needs investigation
no-stale-bot
out of scope
performance
policy 📝
pull-request
Mirrored from GitHub Pull Request
 question
regression
routes
stale
tags
tailscale-feature-gap
well described ❤️
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#1299
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?