home/ssh: proxyjump all pvv machines by default

This commit is contained in:
Oystein Kristoffer Tveit 2024-07-09 11:01:39 +02:00
parent a971075a58
commit 25a34656e9
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
1 changed files with 9 additions and 7 deletions

View File

@ -5,7 +5,11 @@ let
# http://www.pvv.ntnu.no/pvv/Maskiner # http://www.pvv.ntnu.no/pvv/Maskiner
normalMachines = [ normalMachines = [
[ "hildring" "pvv-login" "pvv" ] {
names = [ "hildring" "pvv-login" "pvv" ];
proxyJump = lib.mkDefault null;
}
"dagali"
"demiurgen" "demiurgen"
"eirin" "eirin"
"bekkalokk" "bekkalokk"
@ -13,10 +17,7 @@ let
"shark" "shark"
"buskerud" "buskerud"
"bicep" "bicep"
{ "bob"
names = [ "bob" ];
proxyJump = "hildring";
}
"knutsen" "knutsen"
"isvegg" "isvegg"
[ "microbel" "pvv-users" "pvv-mail" ] [ "microbel" "pvv-users" "pvv-mail" ]
@ -70,10 +71,10 @@ let
nameValuePair name value; nameValuePair name value;
# AttrSet -> AttrSet # AttrSet -> AttrSet
convertNormalMachine = convertMachineWithDefaults { user = normalUser; }; convertNormalMachine = convertMachineWithDefaults { user = normalUser; proxyJump = "pvv"; };
# AttrSet -> AttrSet # AttrSet -> AttrSet
convertAdminMachine = convertAdminMachine =
convertMachineWithDefaults { user = adminUser; proxyJump = "hildring"; }; convertMachineWithDefaults { user = adminUser; proxyJump = "pvv"; };
# ListOf (Either(String ListOf(String) AttrsOf(String))) -> (AttrSet -> AttrSet) -> AttrSet # ListOf (Either(String ListOf(String) AttrsOf(String))) -> (AttrSet -> AttrSet) -> AttrSet
convertMachinesWith = convertMachineFunction: let convertMachinesWith = convertMachineFunction: let
@ -96,6 +97,7 @@ in
hostname = "git.pvv.ntnu.no"; hostname = "git.pvv.ntnu.no";
user = "gitea"; user = "gitea";
port = 2222; port = 2222;
proxyJump = "pvv";
}; };
}; };
} }