From f21651741225cb112df2fa6f5a1c720e7e130de3 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 1 Apr 2025 09:20:29 +0200 Subject: [PATCH] dosei: proxyjump through microbel instead of drolsum --- home/programs/ssh/pvv.nix | 10 +++++++--- hosts/dosei/home/default.nix | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/home/programs/ssh/pvv.nix b/home/programs/ssh/pvv.nix index 54d79c7..8fa9ccf 100644 --- a/home/programs/ssh/pvv.nix +++ b/home/programs/ssh/pvv.nix @@ -24,7 +24,11 @@ let # http://www.pvv.ntnu.no/pvv/Maskiner "isvegg" "knutsen" "kommode" - [ "microbel" "pvv-users" "pvv-mail" ] + { + names = [ "microbel" "pvv-users" "pvv-mail" ]; + proxyJump = lib.mkDefault null; + addressFamily = "inet"; + } "orchid" "shark" "tallulah" @@ -62,7 +66,7 @@ let # http://www.pvv.ntnu.no/pvv/Maskiner name = builtins.concatStringsSep " " names; value = overrideIfNotExists { hostname = "${builtins.head names}.pvv.ntnu.no"; - proxyJump = "pvv"; + proxyJump = "microbel"; addressFamily = "inet"; } (builtins.removeAttrs orig ["names"]); }; @@ -78,7 +82,7 @@ in user = "gitea"; addressFamily = "inet"; port = 2222; - proxyJump = "pvv"; + proxyJump = "microbel"; }; } ]; diff --git a/hosts/dosei/home/default.nix b/hosts/dosei/home/default.nix index 668a8c5..4c71285 100644 --- a/hosts/dosei/home/default.nix +++ b/hosts/dosei/home/default.nix @@ -15,6 +15,7 @@ "hildring pvv-login".proxyJump = "tsuki-ws"; "drolsum pvv-login2 pvv".proxyJump = "tsuki-ws"; + "microbel pvv-users pvv-mail".proxyJump = "tsuki-ws"; }; sops.secrets."git/nordicsemi-maintenance-repos-config" = { };