From 57f5cc4630ccbec9051924b7152656278af2d856 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 21 Jul 2025 12:28:40 -0500 Subject: [PATCH] try --- system-config/services/containers/netbird/default.nix | 10 +++++----- system-config/services/containers/traefik/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system-config/services/containers/netbird/default.nix b/system-config/services/containers/netbird/default.nix index 734f7ce..37f409a 100644 --- a/system-config/services/containers/netbird/default.nix +++ b/system-config/services/containers/netbird/default.nix @@ -26,7 +26,7 @@ networking.firewall = lib.mkIf config.sysconfig.opts.virtualization.netbird.enable { allowedTCPPorts = [ 80 443 33073 33080 10000 ]; allowedUDPPorts = [ 3478 ]; - allowedUDPPortRanges = [{ from = 49152; to = 65535; }]; + allowedUDPPortRanges = [{ from = 49152; to = 54152; }]; }; containers = lib.mkIf config.sysconfig.opts.virtualization.netbird.enable { @@ -54,7 +54,7 @@ containerPort = x; hostPort = x; protocol = "udp"; - }) (builtins.genList (y: y + 49152) (5000)); + }) (builtins.genList (y: y + 49152) (54152 - 49152)); bindMounts = {}; @@ -66,7 +66,7 @@ networking.firewall = { allowedTCPPorts = [ 80 443 33073 33080 10000 ]; allowedUDPPorts = [ 3478 ]; - allowedUDPPortRanges = [{ from = 49152; to = 65535; }]; + allowedUDPPortRanges = [{ from = 49152; to = 54152; }]; }; services.netbird = { @@ -102,7 +102,7 @@ NETBIRD_AUTH_DEVICE_AUTH_CLIENT_ID = "wXR2HlT7fOmDGRbB8FOJP4BaX1u0UF1mo2hLrFlD"; NETBIRD_MGMT_IDP = "authentik"; - NETBIRD_IDP_MGMT_CLIENT_ID = ""; + NETBIRD_IDP_MGMT_CLIENT_ID = "wXR2HlT7fOmDGRbB8FOJP4BaX1u0UF1mo2hLrFlD"; NETBIRD_IDP_MGMT_EXTRA_USERNAME = "Netbird"; NETBIRD_IDP_MGMT_EXTRA_PASSWORD = "jfdkhsjlkasdhfklslhflhljksd"; @@ -111,7 +111,7 @@ NETBIRD_DISABLE_LETSENCRYPT = true; NETBIRD_MGMT_API_ENDPOINT = "https://netbirdapi.blunkall.us:443"; NETBIRD_MGMT_GRPC_API_ENDPOINT = "https://netbirdapi.blunkall.us:443"; - NETBIRD_RELAY_PORT = "443"; + #NETBIRD_RELAY_PORT = "443"; TURN_MAX_PORT = "54152"; diff --git a/system-config/services/containers/traefik/default.nix b/system-config/services/containers/traefik/default.nix index ff32671..bd01555 100644 --- a/system-config/services/containers/traefik/default.nix +++ b/system-config/services/containers/traefik/default.nix @@ -225,19 +225,19 @@ }; netbirdApi = { entryPoints = [ "websecure" ]; - rule = "Host(`netbirdapi.blunkall.us`) && PathPrefix(`/api`)"; + rule = "Host(`vpn.blunkall.us`) && PathPrefix(`/api`)"; service = "netbirdApi"; tls.certResolver = "cloudflare"; }; netbirdMgmt = { entryPoints = [ "websecure" ]; - rule = "Host(`netbirdapi.blunkall.us`) && PathPrefix(`/management`)"; + rule = "Host(`vpn.blunkall.us`) && PathPrefix(`/management.ManagementService`)"; service = "netbirdMgmt"; tls.certResolver = "cloudflare"; }; netbirdSignal = { entryPoints = [ "websecure" ]; - rule = "Host(`netbirdapi.blunkall.us`) && PathPrefix(`/signalexchange`)"; + rule = "Host(`vpn.blunkall.us`) && PathPrefix(`/signalexchange.SignalExchange`)"; service = "netbirdSignal"; tls.certResolver = "cloudflare"; };