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

[PR #388] [MERGED] Add an embedded DERP server to Headscale #1421

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

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/388
Author: @juanfont
Created: 3/4/2022
Status: ✅ Merged
Merged: 3/8/2022
Merged by: @kradalby

Base: main ← Head: embedded-derp

📝 Commits (10+)

  • 897d480 Add an embedded DERP server to Headscale
  • 9d43f58 Added missing deps
  • 23cde84 Merge branch 'main' into embedded-derp
  • 607c1eb Be consistent with uppercase DERP
  • 22d2443 Move more stuff to common
  • 09d78c7 Even more stuff moved to common
  • 758b1ba Renamed configuration items of the DERP server
  • df37d1a Do not offer the option to be DERP insecure
  • b742379 Do not use the term embedded
  • 88378c2 Rename the file to derp_server.go for coherence

📊 Changes

19 files changed (+847 additions, -54 deletions)

View changed files

📝 .dockerignore (+1 -0)
📝 CHANGELOG.md (+1 -0)
📝 Dockerfile.tailscale (+6 -1)
📝 Makefile (+3 -0)
📝 README.md (+1 -0)
📝 app.go (+33 -6)
📝 cmd/headscale/cli/server.go (+3 -4)
📝 cmd/headscale/cli/utils.go (+17 -4)
📝 config-example.yaml (+20 -0)
📝 derp.go (+1 -0)
➕ derp_server.go (+233 -0)
📝 go.mod (+4 -0)
📝 go.sum (+9 -0)
📝 integration_common_test.go (+40 -0)
➕ integration_embedded_derp_test.go (+396 -0)
📝 integration_test.go (+0 -39)
➕ integration_test/etc_embedded_derp/config.yaml (+29 -0)
➕ integration_test/etc_embedded_derp/tls/server.crt (+22 -0)
➕ integration_test/etc_embedded_derp/tls/server.key (+28 -0)

📄 Description

This series of commits will be adding an embedded DERP server (and STUN) to Headscale,
thus making it completely self-contained and not dependent in other infrastructure.

  • raised a GitHub issue or discussed it on the projects chat beforehand
  • added integration tests
  • updated documentation if needed
  • updated CHANGELOG.md

🔄 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/388 **Author:** [@juanfont](https://github.com/juanfont) **Created:** 3/4/2022 **Status:** ✅ Merged **Merged:** 3/8/2022 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `embedded-derp` --- ### 📝 Commits (10+) - [`897d480`](https://github.com/juanfont/headscale/commit/897d480f4dd723ad0c197e9c9a782da8a4503c7f) Add an embedded DERP server to Headscale - [`9d43f58`](https://github.com/juanfont/headscale/commit/9d43f589ae5ac9b902247b5d00ec28cc632b9168) Added missing deps - [`23cde84`](https://github.com/juanfont/headscale/commit/23cde8445f7a3fa38ca2e0bf7b586c018c63a3e1) Merge branch 'main' into embedded-derp - [`607c1eb`](https://github.com/juanfont/headscale/commit/607c1eb3163999fb310170a5ee67a83c634e8196) Be consistent with uppercase DERP - [`22d2443`](https://github.com/juanfont/headscale/commit/22d2443281466006500f3a0ceb2e1f87b21d174d) Move more stuff to common - [`09d78c7`](https://github.com/juanfont/headscale/commit/09d78c7a05b6a9dc90b1a365d0a98ee34f62b112) Even more stuff moved to common - [`758b1ba`](https://github.com/juanfont/headscale/commit/758b1ba1cbcd13fcff10954a301b7773f5921f20) Renamed configuration items of the DERP server - [`df37d1a`](https://github.com/juanfont/headscale/commit/df37d1a639b81e7b9305bba3ef941d38a64604a1) Do not offer the option to be DERP insecure - [`b742379`](https://github.com/juanfont/headscale/commit/b7423796278aa4036bca3e64d587801d8a1fd0eb) Do not use the term embedded - [`88378c2`](https://github.com/juanfont/headscale/commit/88378c22fb41383273f43c9d84aba1e44271b1f6) Rename the file to derp_server.go for coherence ### 📊 Changes **19 files changed** (+847 additions, -54 deletions) <details> <summary>View changed files</summary> 📝 `.dockerignore` (+1 -0) 📝 `CHANGELOG.md` (+1 -0) 📝 `Dockerfile.tailscale` (+6 -1) 📝 `Makefile` (+3 -0) 📝 `README.md` (+1 -0) 📝 `app.go` (+33 -6) 📝 `cmd/headscale/cli/server.go` (+3 -4) 📝 `cmd/headscale/cli/utils.go` (+17 -4) 📝 `config-example.yaml` (+20 -0) 📝 `derp.go` (+1 -0) ➕ `derp_server.go` (+233 -0) 📝 `go.mod` (+4 -0) 📝 `go.sum` (+9 -0) 📝 `integration_common_test.go` (+40 -0) ➕ `integration_embedded_derp_test.go` (+396 -0) 📝 `integration_test.go` (+0 -39) ➕ `integration_test/etc_embedded_derp/config.yaml` (+29 -0) ➕ `integration_test/etc_embedded_derp/tls/server.crt` (+22 -0) ➕ `integration_test/etc_embedded_derp/tls/server.key` (+28 -0) </details> ### 📄 Description This series of commits will be adding an embedded DERP server (and STUN) to Headscale, thus making it completely self-contained and not dependent in other infrastructure. - [x] raised a GitHub issue or discussed it on the projects chat beforehand - [x] added integration tests - [x] updated documentation if needed - [x] updated CHANGELOG.md --- <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:30:00 +01:00
adam closed this issue 2025-12-29 02:30:00 +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#1421
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?