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

diff --git a/.ssh/config.in b/.ssh/config.in
index bbb55e4..0b6b5e0 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -164,23 +164,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
@@ -192,7 +180,7 @@ Host visitor*.gern.madduck.net | visitor*.gern | visitor*
 
 ### LEHEL
 
-Host clegg.lehel.madduck.net | clegg
+Host clegg.lehel.madduck.net | clegg.lehel | clegg
   CheckHostIP no
   ForwardAgent yes
   Hostname clegg.lehel.madduck.net
@@ -202,18 +190,6 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias albatross.lehel
-Host albatrosse
-  Hostname wall.lehel.madduck.net
-  Port 22032
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.lehel
-
-Host fishbowl.lehel.madduck.net | fishbowl.lehel
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl
 
 ### GAUTING
 
@@ -255,10 +231,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