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

diff --git a/.ssh/config.in b/.ssh/config.in
index 550d969..3ddafb6 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -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,10 +69,10 @@ 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 | eugene-kvm
+Host eugene.madduck.net | eugene
   Hostname eugene.madduck.net
 Host eugene-luks
   Hostname eugene.madduck.net
@@ -141,9 +144,9 @@ Host albatross-via-clegg | ralbatross
   DynamicForward localhost:9049
 
 Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
-  Hostname bike.lehel.madduck.net
+  Hostname bike.lehel.vpn.madduck.net
   HostKeyAlias bike.lehel
-  ProxyJump albatross.lehel.madduck.net
+  ProxyJump domine.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -161,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
@@ -199,7 +198,9 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic
 ### CATALYST
 
 Host atom.catalyst.madduck.net | atom.catalyst | atom
-  Hostname 192.168.19.1
+  Hostname atom.catalyst.vpn.madduck.net
+  HostKeyAlias atom.catalyst.madduck.net
+  CheckHostIP no
   ProxyJump domine.madduck.net
 
 ### ROAD WARRIORS
@@ -212,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
@@ -321,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