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

diff --git a/.ssh/config.in b/.ssh/config.in
index 4e0a495..0b6b5e0 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -164,28 +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 galaxy-s2.phones.gern | galaxy-s2
-  Hostname galaxy-s2.phones.gern
-  HostKeyAlias galaxy-s2.phones.gern
-  User root
-
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
   ForwardAgent yes
@@ -197,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
@@ -207,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
 
@@ -260,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
 
@@ -872,6 +847,11 @@ Host nelson.debconf.org | penta.debconf.org | nelson | summit
   Hostname nelson.debconf.org
   ProxyCommand ssh people.debian.org nc -q0 %h %p
 
+### PENNY
+
+Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
+  Hostname lion.mjollnir.org
+
 ### TILDE CLUB
 
 Host remotes.club