sif: wgrz

2 files changed, 13 insertions, 4 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index b2e9d947..15351b0d 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -78,8 +78,12 @@ in {
             PubkeyAcceptedAlgorithms +ssh-rsa
             ConnectTimeout 30
 
-          Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
-            ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
+          Match host *.mathinst.loc !host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
+            # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
+            ProxyJump mathw0g
+
+          Match host mathw0g.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
+            HostName mathw0g.math.lmu.de
 
           Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
             ProxyJump mathw0h
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index e7087c26..94ba4e9b 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -314,13 +314,13 @@
       proxyJump = "mathw0h";
     };
   "mathw0g" =
-    { hostname = "mathw0g.math.lmu.de";
+    { hostname = "mathw0g.mathinst.loc";
     };
   "mathw0h" =
     { hostname = "mathw0h.mathinst.loc";
     };
   "proxy.mathw0g" =
-    { hostname = "mathw0g.math.lmu.de";
+    { hostname = "mathw0g.mathinst.loc";
       extraOptions = {
         ControlPath = "none";
         ServerAliveCountMax = "15";
@@ -352,6 +352,11 @@
       proxyJump = "mathw0h";
       user = "root";
     };
+  "vpn-wg01" =
+    { hostname = "vpn-wg01.mathinst.loc";
+      proxyJump = "mathw0h";
+      user = "root";
+    };
   "repo-apt01" =
     { hostname = "repo-apt01.mathinst.loc";
       proxyJump = "mathw0h";