X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/a0f8f852493b596a56df2ff9c287c7e856718a78..e53078a2ee4f97198f144d71e82b744c30307d39:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 8905797..3a2c973 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -12,6 +12,9 @@ Host eclipse-luks
   AddressFamily inet
   User root
 
+Host eclipse-fallback.madduck.net | eclipse-fallback
+  HostKeyAlias eclipse.madduck.net
+
 Host emily.madduck.net | emily | eclipse-kvm
   Hostname emily.madduck.net
 
@@ -147,7 +150,7 @@ Host albatross-via-clegg | ralbatross
   DynamicForward localhost:9049
 
 Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
-  Hostname bike.lehel.vpn.madduck.net
+  Hostname bike.lehel.madduck.net
   HostKeyAlias bike.lehel
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
@@ -169,6 +172,10 @@ Host julia-luks
   AddressFamily inet
   User root
 
+Host kodi.gern.madduck.net | kodi
+  Hostname kodi.gern.madduck.net
+  User root
+
 Host echo.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
   Hostname echo.kids.gern.madduck.net
   HostKeyAlias echo.kids.gern.madduck.net
@@ -179,16 +186,15 @@ Host visitor*.gern.madduck.net | visitor*.gern
 
 ### ROAD WARRIORS
 
-Host lotus.*
-  CheckHostIP no
+Host lotus.gern
   HostKeyAlias lotus
+  ConnectTimeout 120
+  ProxyCommand ssh wall.gern.madduck.net "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
   LocalForward localhost:8385 localhost:8384
 
-Host lotus | lotus.rw.madduck.net
+Host lotus.* | lotus
   CheckHostIP no
   HostKeyAlias lotus
-  #ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,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 -F -vq0 \${TARGETS%%%%,*} %p"
-  #ProxyUseFdpass yes
   LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -221,8 +227,16 @@ Host squiggle.city
   Hostname squiggle.city
   User madduck
 
+Host tilde.club
+  Hostname tilde.club
+  User madduck
+
 ### MISC
 
+Host nz
+  Hostname 202.78.240.196
+  User madduck
+
 Host github.com | github
   Hostname github.com
   User git
@@ -261,7 +275,7 @@ Match host *.debian.org
 Host *
   IgnoreUnknown *
   ConnectTimeout 30
-  ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
+  ControlPath ~/.var/ssh/ssh_control_%l_%k_%p_%r
   ControlMaster auto
   ControlPersist 30
   ExitOnForwardFailure no