From c5f469a03bc89680bfae61632396879812393662 Mon Sep 17 00:00:00 2001
From: Krzysztof Nazarewski <gpg@kdn.im>
Date: Thu, 9 Jan 2025 15:42:33 +0100
Subject: [PATCH] nixos/netbird: update docs & release notes

---
 nixos/doc/manual/redirects.json                   | 6 ++++++
 nixos/doc/manual/release-notes/rl-2505.section.md | 3 +++
 nixos/modules/services/networking/netbird.md      | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 443cc445ad69fd..a103e8bd5cff7d 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -836,6 +836,12 @@
   "module-services-netbird-multiple-connections": [
     "index.html#module-services-netbird-multiple-connections"
   ],
+  "module-services-netbird-firewall": [
+    "index.html#module-services-netbird-firewall"
+  ],
+  "module-services-netbird-customization": [
+    "index.html#module-services-netbird-customization"
+  ],
   "module-services-mosquitto": [
     "index.html#module-services-mosquitto"
   ],
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index cb005a1e9b9621..92f1411d8b7f2c 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -357,6 +357,9 @@
   as before, you can use plugins like `python3Packages.jax-cuda12-plugin`.
 
 
+- `services.netbird.tunnels` was renamed to [`services.netbird.clients`](#opt-services.netbird.clients),
+  hardened (using dedicated less-privileged users) and significantly extended.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Other Notable Changes {#sec-release-25.05-notable-changes}
diff --git a/nixos/modules/services/networking/netbird.md b/nixos/modules/services/networking/netbird.md
index 435c2b16cc15be..876c27cb0d22e7 100644
--- a/nixos/modules/services/networking/netbird.md
+++ b/nixos/modules/services/networking/netbird.md
@@ -17,10 +17,10 @@ Which is equivalent to:
 
 ```nix
 {
-  services.netbird.clients.default = {
+  services.netbird.clients.wt0 = {
     port = 51820;
-    interface = "wt0";
     name = "netbird";
+    interface = "wt0";
     hardened = false;
   };
 }