X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/d18f31d2a5d42196fe0d666041b79865348eea3f..9eb859555bf2ba382e845c17b7d8a93501ef8599:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index ecfd291..0240a5b 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
@@ -141,6 +135,10 @@ Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
 
+Host pulse.madduck.net | pulse
+  ForwardAgent yes
+  Hostname pulse.madduck.net
+
 ### ARNOLD / GPLHOST
 
 Host arnold.madduck.net | arnold
@@ -164,23 +162,11 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
-Host juliae
-  Hostname wall.gern.madduck.net
-  Port 22002
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias julia.gern.madduck.net
 
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
   HostKeyAlias julia.gern.madduck.net
 
-Host fishbowl.gern.madduck.net | fishbowl.gern
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl
-
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
   ForwardAgent yes
@@ -243,10 +229,14 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
 
 ### ROAD WARRIORS
 
-Host fishbowl
+Host fishbowl | fishbowl.gern | fishbowl.lehel
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
+  HostKeyAlias fishbowl
+  CanonicalizeHostname yes
+  CanonicalizeMaxDots 0
+  CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
 
 ### DEBIAN