X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/a7f34fec4637bb8c82b3cc1fa46f73fdb7392451..30db4f331936b1e72e352e89bdb2ba3f7fbeeecc:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 71a6184..80f2d85 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -125,14 +125,7 @@ Host franz.ifi.uzh.ch | franz
   Hostname franz.ifi.uzh.ch
   User krafft
 
-### SWAN / BYTEMARK
-
-Host swan-host | swan-host.madduck.net
-  Hostname swan-host.madduck.net
-  User krafft
-
-Host swan.madduck.net | swan
-  Hostname swan.madduck.net
+### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
   Hostname piper.madduck.net
@@ -159,6 +152,7 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
+  ForwardX11 yes
 
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
@@ -231,9 +225,7 @@ Host fishbowl | fishbowl.gern | fishbowl.lehel | fishbowl.rw.madduck.net
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias fishbowl
-  CanonicalizeHostname yes
-  CanonicalizeMaxDots 0
-  CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,rw}.madduck.net; eval fping -aAC1 -t100 $TRIES; eval fping6 -aAC1 -t100 $TRIES; wait) 2>&1 | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; nc -vq0 \${TARGETS%%%%,*} %p"
 
 ### LOCAL VIRT HOSTS