update debian scm, host keys

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index de2bc4df1ee80ba66f27c20bf38264e7c2e9e63e..89ade72bed60242eabe7a73abd9b03214fe708eb 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -134,7 +134,7 @@ Host swan.madduck.net | swan
   Hostname swan.madduck.net
 
 ### ARNOLD / GPLHOST
-#
+
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
   User xen05
@@ -157,17 +157,10 @@ Host juliae
   ForwardX11 yes
   HostKeyAlias julia.gern.madduck.net
 
-Host albatross.lehel.madduck.net | albatross
-  Hostname albatross.lehel.madduck.net
+Host fishbowl.gern.madduck.net | fishbowl.gern
   ForwardAgent yes
   ForwardX11 yes
-Host albatrosse
-  Hostname wall.gern.madduck.net
-  Port 22032
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.lehel.madduck.net
+  HostKeyAlias fishbowl.gern
 
 Host galaxy-s2.phones.gern | galaxy-s2
   Hostname galaxy-s2.phones.gern
@@ -190,6 +183,24 @@ Host clegg.lehel.madduck.net | clegg
   ForwardAgent yes
   Hostname clegg.lehel.madduck.net
 
+Host albatross.lehel.madduck.net | albatross.lehel | albatross
+  Hostname albatross.lehel.madduck.net
+  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.lehel
+
 ### GAUTING
 
 Host embryo.gauting.madduck.net | embryo
@@ -204,7 +215,7 @@ Host mother.gauting | mother | mother.gauting.madduck.net
   ForwardX11 yes
 Host mothere
   Hostname embryo.gauting.madduck.net
-  Port 22221
+  Port 22021
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -222,14 +233,15 @@ Host bricke
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
-### ROAD WARRIORS
+### MOUNT VICTORIA
 
-Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
-  CheckHostIP no
+Host atom.mtvic.madduck.net | atom.mtvic | atom
+  Hostname atom.mtvic.madduck.net
   ForwardAgent yes
-  ForwardX11 yes
 
-Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
+### ROAD WARRIORS
+
+Host fishbowl
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -237,19 +249,19 @@ Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
 ### DEBIAN
 
 Host scm.alioth.debian.org
-  HostKeyAlias wagner.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host svn.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host git.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host hg.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host cvs.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 
 Host people.debian.org