JuliusFreudenberger/nix-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Make host and docker setupKeys optional for netbird-client module

Browse source
This commit is contained in:
JuliusFreudenberger 2026-06-18 01:26:44 +02:00
parent 8325d3d86a
commit e5757374d2
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/netbird-client.nix
View file

@ -15,7 +15,8 @@ let
options = { options = {
setupKey = lib.mkOption { setupKey = lib.mkOption {
description = "Setup Key for this client"; description = "Setup Key for this client";
type = lib.types.str; type = lib.types.nullOr lib.types.str;
default = null;
}; };
}; };
}; };
@ -44,7 +45,7 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.netbird = { services.netbird = lib.mkIf (cfg.host.setupKey != null) {
useRoutingFeatures = "both"; useRoutingFeatures = "both";
clients.wt0 = { clients.wt0 = {
hardened = false; hardened = false;
@ -60,9 +61,9 @@ in {
}; };
systemd.services.${config.services.netbird.clients.wt0.service.name}.path = [ pkgs.shadow ]; systemd.services.${config.services.netbird.clients.wt0.service.name}.path = [ pkgs.shadow ];
services.resolved.enable = true; services.resolved.enable = lib.mkIf (cfg.host.setupKey != null) true;
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = lib.mkIf (cfg.docker.setupKey != null) {
netbird = { netbird = {
image = "netbirdio/netbird:${clientVersion}-rootless"; image = "netbirdio/netbird:${clientVersion}-rootless";
autoStart = true; autoStart = true;
@ -81,7 +82,7 @@ in {
}; };
}; };
systemd.services."docker-netbird" = { systemd.services."docker-netbird" = lib.mkIf (cfg.docker.setupKey != null) {
after = [ after = [
"docker-network-webproxy.service" "docker-network-webproxy.service"
]; ];
@ -91,7 +92,7 @@ in {
}; };
systemd.services."docker-network-webproxy" = { systemd.services."docker-network-webproxy" = lib.mkIf (cfg.docker.setupKey != null) {
path = [ pkgs.docker_29 ]; path = [ pkgs.docker_29 ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";