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

diff --git a/.ssh/config.in b/.ssh/config.in
index 6c33ac4..3a2c973 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -186,18 +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
-  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"
-  #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
@@ -278,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