From dd22a98cdb805529d834c60801c43f8b02596e4a Mon Sep 17 00:00:00 2001 From: BOTAlex Date: Sun, 5 Apr 2026 00:57:29 +0200 Subject: [PATCH] sync --- networking/caddy.nix | 8 +++++++- vms/kube-daddy/argo-forward.nix | 4 ++-- vms/kube-daddy/default.nix | 6 ++++++ vms/kube-daddy/jelly-forward.nix | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/networking/caddy.nix b/networking/caddy.nix index dfcad0f..c056985 100644 --- a/networking/caddy.nix +++ b/networking/caddy.nix @@ -44,7 +44,13 @@ services.caddy.virtualHosts."jelly.deprived.dev" = { extraConfig = '' - reverse_proxy * 127.0.0.1:8096 + reverse_proxy * 10.0.0.2:8096 + ''; + }; + + services.caddy.virtualHosts."netbird.deprived.dev" = { + extraConfig = '' + reverse_proxy * 10.0.0.2:3324 ''; }; diff --git a/vms/kube-daddy/argo-forward.nix b/vms/kube-daddy/argo-forward.nix index 37d252e..eecb731 100644 --- a/vms/kube-daddy/argo-forward.nix +++ b/vms/kube-daddy/argo-forward.nix @@ -8,14 +8,14 @@ after = [ "network-online.target" - "microvm@kubernetes.service" ]; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; script = '' - sleep 10 + sleep 30 ${pkgs.kubernetes}/bin/kubectl patch cm argocd-cmd-params-cm -n argocd --type merge --patch '{"data":{"server.insecure": "true", "url":"https://argocd.deprived.dev"}}' + ${pkgs.kubernetes}/bin/kubectl -n argocd rollout restart deployment argocd-repo-server ${pkgs.kubernetes}/bin/kubectl port-forward svc/argocd-server -n argocd 4325:443 --address 0.0.0.0 || true ''; diff --git a/vms/kube-daddy/default.nix b/vms/kube-daddy/default.nix index 339689f..e26d5e9 100644 --- a/vms/kube-daddy/default.nix +++ b/vms/kube-daddy/default.nix @@ -59,6 +59,12 @@ # destination = "10.0.0.2:8080"; # proto = "tcp"; # } + { + # Netbird + sourcePort = 3478; + destination = "10.0.0.2:3478"; + proto = "udp"; + } { sourcePort = 6443; destination = "10.0.0.2:6443"; diff --git a/vms/kube-daddy/jelly-forward.nix b/vms/kube-daddy/jelly-forward.nix index f422995..0490dfb 100644 --- a/vms/kube-daddy/jelly-forward.nix +++ b/vms/kube-daddy/jelly-forward.nix @@ -15,7 +15,7 @@ script = '' sleep 5 - ${pkgs.kubernetes}/bin/kubectl port-forward jellyfin -n argocd 8096:8096 --address 0.0.0.0 || true + ${pkgs.kubernetes}/bin/kubectl -n jellyfin port-forward deployment/jellyfin-deployment 8096:8096 --address 0.0.0.0 || true ''; serviceConfig = {