X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/7c5fa8e92705cd084dbfe15d32743e4d531be345..5a8078d8d93a56f3dfb421490cd4326e45ea5450:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index d469b7c..3ddafb6 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -12,7 +12,7 @@ Host charade-vnc
   ControlPath none
   Hostname charade.madduck.net
 
-Host emily.madduck.net | emily
+Host emily.madduck.net | emily | charade-kvm
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
@@ -55,6 +55,9 @@ Host pulse.madduck.net | pulse
 Host vera.madduck.net | vera
   Hostname vera.madduck.net
 
+Host arnold.madduck.net | arnold
+  Hostname arnold.madduck.net
+
 Host seamus.madduck.net | seamus
   Hostname seamus.madduck.net
 
@@ -66,7 +69,7 @@ Host lunatic.madduck.net | lunatic
 
 ### UNI ZURICH MACHINES
 
-Host gig.madduck.net | gig
+Host gig.madduck.net | gig | eugene-kvm
   Hostname gig.madduck.net
 
 Host eugene.madduck.net | eugene
@@ -140,9 +143,10 @@ Host albatross-via-clegg | ralbatross
   LocalForward localhost:8387 localhost:8384
   DynamicForward localhost:9049
 
-Host bike.lehel.madduck.net | bike.lehel | bike
-  Hostname bike.lehel.madduck.net
+Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
+  Hostname bike.lehel.vpn.madduck.net
   HostKeyAlias bike.lehel
+  ProxyJump domine.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -160,10 +164,6 @@ Host mothere
   CheckHostIP no
   HostKeyAlias mother.gauting.madduck.net
 
-Host bell.gauting | bell | bell.gauting.madduck.net
-  Hostname bell.fritz.box
-  HostKeyAlias bell.gauting.madduck.net
-
 ### MTVIC
 
 Host wall.mtvic.madduck.net | wall.mtvic | wall
@@ -198,20 +198,12 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic
 ### CATALYST
 
 Host atom.catalyst.madduck.net | atom.catalyst | atom
-  Hostname atom.catalyst.madduck.net
-
-### ROAD WARRIORS
-
-Host fishbowl.*
+  Hostname atom.catalyst.vpn.madduck.net
+  HostKeyAlias atom.catalyst.madduck.net
   CheckHostIP no
-  HostKeyAlias fishbowl
-  LocalForward localhost:8386 localhost:8384
+  ProxyJump domine.madduck.net
 
-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
+### ROAD WARRIORS
 
 Host lotus.*
   CheckHostIP no
@@ -221,7 +213,7 @@ Host lotus.*
 Host lotus | lotus.rw.madduck.net
   CheckHostIP no
   HostKeyAlias lotus
-  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"
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,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:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -330,6 +322,10 @@ Host lion.mjollnir.org | lion
   Hostname lion.mjollnir.org
   User madduck
 
+Host files.northdrive.de | idiotheke
+  Hostname files.northdrive.de
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
@@ -338,7 +334,7 @@ Match host *.madduck.net
 
 Host *
   IgnoreUnknown *
-  ConnectTimeout 10
+  ConnectTimeout 30
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ControlPersist 30