X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/cd21d031378bda245205e9b1365ae1a458d97f92..4079aa0c3659b213d65aaed17cbf6c87227b22ea:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index d8ba9f0..c237b89 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -134,8 +134,8 @@ Host swan-host | swan-host.madduck.net
 Host swan.madduck.net | swan
   Hostname swan.madduck.net
 
-Host pulse.madduck.net | pulse
-  Hostname pulse.madduck.net
+Host piper.madduck.net | piper
+  Hostname piper.madduck.net
 
 ### ARNOLD / GPLHOST
 
@@ -226,23 +226,26 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
 
 ### ROAD WARRIORS
 
-Host fishbowl | fishbowl.gern | fishbowl.lehel
+Host fishbowl | fishbowl.gern | fishbowl.lehel | fishbowl.rw.madduck.net
   CheckHostIP no
   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
 
-Host *.virt
+Host *.virt | 192.168.122.* | red | green | blue | yellow | black | white | orange | violet
   CheckHostIP no
   ForwardAgent yes
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
   ControlMaster no
+  User root
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
 
 ### DEBIAN