X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/63c7606706cca46e64faff36167b62efff1f5ae1..66373126718846571b5e9d8e092c9945a0f4af60:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 18af8a2..550d969 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -143,6 +143,7 @@ Host albatross-via-clegg | ralbatross
 Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
   Hostname bike.lehel.madduck.net
   HostKeyAlias bike.lehel
+  ProxyJump albatross.lehel.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -198,21 +199,11 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic
 ### CATALYST
 
 Host atom.catalyst.madduck.net | atom.catalyst | atom
-  Hostname atom.catalyst.madduck.net
+  Hostname 192.168.19.1
+  ProxyJump domine.madduck.net
 
 ### ROAD WARRIORS
 
-Host fishbowl.*
-  CheckHostIP no
-  HostKeyAlias fishbowl
-  LocalForward localhost:8386 localhost:8384
-
-Host fishbowl | fishbowl.rw.madduck.net
-  CheckHostIP no
-  HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
-  LocalForward localhost:8386 localhost:8384
-
 Host lotus.*
   CheckHostIP no
   HostKeyAlias lotus