summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-12-08 15:43:47 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-12-08 15:43:47 +0100
commit3953a182a0cc1b9d2cb9bd45dd1a64e0903812b1 (patch)
tree20a965f09fb64f6c30481bb2f4f2e59246f74b70
parenta2962229c6a81ac23a685d243fa43d83957b4fc4 (diff)
downloadnixos-3953a182a0cc1b9d2cb9bd45dd1a64e0903812b1.tar
nixos-3953a182a0cc1b9d2cb9bd45dd1a64e0903812b1.tar.gz
nixos-3953a182a0cc1b9d2cb9bd45dd1a64e0903812b1.tar.bz2
nixos-3953a182a0cc1b9d2cb9bd45dd1a64e0903812b1.tar.xz
nixos-3953a182a0cc1b9d2cb9bd45dd1a64e0903812b1.zip
gkleen@sif: socks4a instead of jumpHost
-rw-r--r--accounts/gkleen@sif/default.nix2
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix1
2 files changed, 1 insertions, 2 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 70a5c9f2..03bd4366 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -78,7 +78,7 @@ in {
78 PubkeyAcceptedAlgorithms +ssh-rsa 78 PubkeyAcceptedAlgorithms +ssh-rsa
79 79
80 Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null" 80 Match host *.mathinst.loc !exec "nc -z -w 1 %h %p &>/dev/null"
81 ProxyJump mathw0g 81 ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
82 82
83 Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null" 83 Match host *.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
84 ProxyJump mathw0h 84 ProxyJump mathw0h
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 06b9ccaa..cd4c0c2d 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -285,7 +285,6 @@
285 }; 285 };
286 "mathw0h" = 286 "mathw0h" =
287 { hostname = "mathw0h.mathinst.loc"; 287 { hostname = "mathw0h.mathinst.loc";
288 proxyJump = "mathw0g";
289 }; 288 };
290 "proxy.mathw0g" = 289 "proxy.mathw0g" =
291 { hostname = "mathw0g.math.lmu.de"; 290 { hostname = "mathw0g.math.lmu.de";