X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/90864faa3fa50507c04ec713a37a5ecbd91628e3..aede152133f67fc0e80c9116318d30a996c60b89:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 342a9d7..89ade72 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -8,11 +8,19 @@ Host 127.0.0.1 | localhost
 
 Host charade.madduck.net | charade
   ForwardAgent yes
-  Hostname 192.168.14.153
+  Hostname charade.madduck.net
 Host charade-vnc
   ControlMaster no
   ControlPath none
-  Hostname 192.168.14.153
+  Hostname charade.madduck.net
+
+Host matilda.madduck.net | matilda
+  ForwardAgent yes
+  Hostname matilda.madduck.net
+
+Host vizier.madduck.net | vizier
+  ForwardAgent yes
+  Hostname vizier.madduck.net
 
 ### KHYBER KVM HOST
 
@@ -24,10 +32,6 @@ Host khyber-vnc
   ControlPath none
   Hostname khyber.madduck.net
 
-Host vera.madduck.net | vera
-  ForwardAgent yes
-  Hostname vera.madduck.net
-
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
@@ -64,10 +68,6 @@ Host imap.madduck.net
 Host aika.krafftwerk.de | aika
   Hostname aika.krafftwerk.de
 
-Host vizier.madduck.net | vizier
-  ForwardAgent yes
-  Hostname vizier.madduck.net
-
 Host sysyphus.madduck.net | sysyphus
   ForwardAgent yes
   Hostname sysyphus.madduck.net
@@ -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,20 +157,14 @@ Host juliae
   ForwardX11 yes
   HostKeyAlias julia.gern.madduck.net
 
-Host albatross.gern.madduck.net | albatross
-  Hostname albatross.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-Host albatrosse
-  Hostname wall.gern.madduck.net
-  Port 22032
-  CheckHostIP no
+Host fishbowl.gern.madduck.net | fishbowl.gern
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias albatross.gern.madduck.net
+  HostKeyAlias fishbowl.gern
 
 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
@@ -189,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
@@ -203,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
@@ -221,31 +233,35 @@ 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
 
 ### DEBIAN
 
+Host scm.alioth.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
@@ -373,6 +389,18 @@ Host zelenka.debian.org | zelenka
   Hostname zelenka.debian.org
   User madduck
 
+### NZ
+
+Host workbuffer.org | nz
+  Hostname workbuffer.org
+  User madduck
+
+### MISC
+
+Host github.com | github
+  Hostname github.com
+  User git
+
 ### DEFAULTS
 
 Host *