1 files changed, 51 insertions, 34 deletions

diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 107f1e76..a250509b 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -1,5 +1,12 @@
-{ pkgs, ... }:
-{
+{ lib, pkgs, ... }:
+let
+  autosshProxyPorts = {
+    "ssh.math.lmu.de" = 8118;
+    "mathw0h" = 8122;
+    "mathw0e" = 8124;
+  };
+  autosshProxy = host: "${lib.getExe pkgs.socat} - SOCKS4A:127.0.0.1:%h:%p,socksport=${toString autosshProxyPorts.${host}}";
+in {
   "git.ymir" =
     { hostname = "ymir.yggdrasil.li";
       user = "gitolite";
@@ -290,15 +297,15 @@
     };
   "mathw0d" =
     { hostname = "mathw0d.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mathw0e" =
     { hostname = "mathw0e.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mathw0f" =
     { hostname = "mathw0f.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mathw0g" =
     { hostname = "mathw0g.mathinst.loc";
@@ -306,8 +313,8 @@
   "mathw0h" =
     { hostname = "mathw0h.mathinst.loc";
     };
-  "proxy.mathw0g" =
-    { hostname = "mathw0g.mathinst.loc";
+  "proxy.ssh.math.lmu.de" =
+    { hostname = "ssh.math.lmu.de";
       extraOptions = {
         ControlPath = "none";
         ExitOnForwardFailure = "yes";
@@ -317,7 +324,17 @@
     };
   "proxy.mathw0h" =
     { hostname = "mathw0h.mathinst.loc";
-      proxyJump = "proxy.mathw0g";
+      proxyCommand = autosshProxy "ssh.math.lmu.de";
+      extraOptions = {
+        ControlPath = "none";
+        ExitOnForwardFailure = "yes";
+        ServerAliveCountMax = "15";
+        ServerAliveInterval = "2";
+      };
+    };
+  "proxy.mathw0e" =
+    { hostname = "mathw0e.mathinst.loc";
+      proxyCommand = autosshProxy "mathw0h";
       extraOptions = {
         ControlPath = "none";
         ExitOnForwardFailure = "yes";
@@ -327,7 +344,7 @@
     };
   "vrt-kvm06" =
     { hostname = "vrt-kvm06";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -336,7 +353,7 @@
     };
   "vrt-kvm05" =
     { hostname = "vrt-kvm05";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -345,7 +362,7 @@
     };
   "vrt-kvm04" =
     { hostname = "vrt-kvm04";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -354,7 +371,7 @@
     };
   "vrt-kvm02" =
     { hostname = "vrt-kvm02";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -363,7 +380,7 @@
     };
   "vrt-kvm03" =
     { hostname = "vrt-kvm03";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -372,7 +389,7 @@
     };
   "vrt-kvm01" =
     { hostname = "vrt-kvm01";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -381,39 +398,44 @@
     };
   "tts-www01" =
     { hostname = "tts-www01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "vpn-wg01" =
     { hostname = "vpn-wg01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "repo-apt01" =
     { hostname = "repo-apt01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "ldap-lmumr01" =
     { hostname = "ldap-lmumr01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "mail-mi01" =
     { hostname = "mail-mi01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mail-www02" =
     { hostname = "mail-www02.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "dpl-fai01" =
     { hostname = "dpl-fai01.mathinst.loc";
       user = "root";
     };
+  "dpl-fai02" =
+    { hostname = "dpl-fai02.mathinst.loc";
+      user = "root";
+      proxyJump = "mgmt01";
+    };
   "math05" =
     { hostname = "math05.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       extraOptions.KexAlgorithms = "+diffie-hellman-group1-sha1";
     };
   "switch01" =
@@ -439,20 +461,20 @@
     };
   "www-mi01" =
     { hostname = "www-mi01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "cip04" =
     { hostname = "cip04.cipmath.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mgmt-cls01" =
     { user = "root";
       hostname = "mgmt-cls01.cipmath.loc";
-      proxyJump = "ssh.math.lmu.de";
+      proxyCommand = autosshProxy "ssh.math.lmu.de";
     };
   "mgmt01" =
     { hostname = "mgmt01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "ssh-lb01" =
@@ -471,17 +493,17 @@
   "rdlx02" = { hostname = "rdlx02.mathinst.loc"; proxyJump = "mgmt01"; };
   "math0d" =
     { hostname = "math0d.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "dhcp01" =
     { hostname = "dhcp01.mathinst.loc";
       user = "root";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "dhcp02" =
     { hostname = "dhcp02.mathinst.loc";
       user = "root";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "cc-gpu-l01" =
     { hostname = "cc-gpu-l01.mathinst.loc";
@@ -546,7 +568,7 @@
       user = "root";
     };
   "nas*" =
-    { proxyJump = "mathw0e";
+    { proxyCommand = autosshProxy "mathw0e";
       user = "admin";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -554,9 +576,4 @@
         HostKeyAlgorithms = "+ecdsa-sha2-nistp256";
       };
     };
-  "game01" =
-    { hostname = "game01.yggdrasil.li";
-      user = "factorio";
-      identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
-    };
 }