X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/0efb1832c6d7d16b1a6e200733dfc5b3707d9eb6..e7a61bcf61e24c64a338a7c9b2f57c4279082287:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index b38cff9..7f8eebe 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -40,10 +40,26 @@ Host khyber.madduck.net | khyber
   ForwardAgent yes
   Hostname khyber.madduck.net
 
+Host wots.madduck.net | wots
+  ForwardAgent yes
+  Hostname wots.madduck.net
+
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
 
+Host jugband.madduck.net | jugband
+  ForwardAgent yes
+  Hostname jugband.madduck.net
+
+Host swan-host | swan-host.madduck.net
+  Hostname swan-host.madduck.net
+  User krafft
+
+Host swan.madduck.net | swan
+  ForwardAgent yes
+  Hostname swan.madduck.net
+
 Host martin-krafft.net
   User madduck
   HostKeyAlias seamus.madduck.net
@@ -55,7 +71,9 @@ Host madduck.net
   HostKeyAlias seamus.madduck.net
 
 Host tunes.madduck.net | tunes
-  Hostname bell.madduck.net
+  AddressFamily inet
+  ControlMaster no
+  Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
@@ -89,7 +107,7 @@ Host piper.oerlikon.madduck.net | piper
   ForwardX11 yes
 #  AddressFamily inet
 Host pipere
-  Hostname wall.madduck.net
+  Hostname wall.oerlikon.madduck.net
   Port 22223
   CheckHostIP no
   ForwardAgent yes
@@ -102,7 +120,7 @@ Host diamond.oerlikon.madduck.net | diamond
   ForwardX11 yes
 #  AddressFamily inet
 Host diamonde
-  Hostname wall.madduck.net
+  Hostname wall.oerlikon.madduck.net
   Port 22224
   CheckHostIP no
   ForwardAgent yes
@@ -130,7 +148,7 @@ Host mother.gauting.madduck.net | mother
   ForwardAgent yes
   ForwardX11 yes
 Host mothere
-  Hostname embryo.madduck.net
+  Hostname embryo.gauting.madduck.net
   Port 22221
   CheckHostIP no
   ForwardAgent yes
@@ -142,7 +160,7 @@ Host brick.gauting.madduck.net | brick
   ForwardAgent yes
   ForwardX11 yes
 Host bricke
-  Hostname embryo.madduck.net
+  Hostname embryo.gauting.madduck.net
   Port 22222
   CheckHostIP no
   ForwardAgent yes
@@ -171,6 +189,9 @@ Host git.debian.org
 Host hg.debian.org
   HostKeyAlias alioth.debian.org
   User madduck
+Host cvs.debian.org
+  HostKeyAlias alioth.debian.org
+  User madduck
 
 Host malo.debian.org | malo
   Hostname malo.debian.org
@@ -346,9 +367,11 @@ Host rem.debian.org | rem
 Host smetana.debian.org | smetana
   Hostname smetana.debian.org
   User madduck
-
-Host cvs.debian.org
-  HostKeyAlias gluck.debian.org
+Host strauss.debian.net | strauss
+  Hostname strauss.debian.net
+  User madduck
+Host bellini.debian.org | bellini
+  Hostname bellini.debian.org
   User madduck
 
 Host people.debian.org
@@ -362,8 +385,8 @@ Host nikolai.ifi.uzh.ch | nikolai
   Hostname nikolai.ifi.uzh.ch
   User krafft
 
-Host gratis2.opro.ch | opro
-  Hostname 193.242.105.2
+Host clegg-host | clegg-host.madduck.net | gratis2.opro.ch | opro
+  Hostname clegg-host.madduck.net
   User madduck
 
 Host skynet.skynet.ie | skynet.ie | skynet