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

diff --git a/.ssh/config.in b/.ssh/config.in
index 0b6b5e0..80f2d85 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -86,12 +86,6 @@ Host ssh443.madduck.net | ssh443
 Host openvpn.madduck.net | openvpn
   HostKeyAlias sysyphus.madduck.net
 
-Host wots.madduck.net | wots
-  ForwardAgent yes
-  Hostname wots.madduck.net
-Host buildd.debian.madduck.net | buildd
-  HostKeyAlias wots.madduck.net
-
 ### UNI ZURICH MACHINES
 
 Host diamond.madduck.net | diamond
@@ -131,20 +125,14 @@ Host franz.ifi.uzh.ch | franz
   Hostname franz.ifi.uzh.ch
   User krafft
 
-### SWAN / BYTEMARK
+### PIPER / BYTEMARK
 
-Host swan-host | swan-host.madduck.net
-  Hostname swan-host.madduck.net
-  User krafft
-
-Host swan.madduck.net | swan
-  ForwardAgent yes
-  Hostname swan.madduck.net
+Host piper.madduck.net | piper
+  Hostname piper.madduck.net
 
 ### ARNOLD / GPLHOST
 
 Host arnold.madduck.net | arnold
-  ForwardAgent yes
   Hostname arnold.madduck.net
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
@@ -164,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,14 +220,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
+  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 | 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
-  CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
 
 ### DEBIAN