X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/e8ab98f2b24ee14a210917606d65ffe2b67e4940..6e8c08f09d7fd11ee3c11b33f9180f5f7031c0bf:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 63107ed..369f33a 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -40,6 +40,18 @@ 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 martin-krafft.net
   User madduck
   HostKeyAlias seamus.madduck.net
@@ -51,7 +63,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
@@ -85,7 +99,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
@@ -98,7 +112,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
@@ -111,9 +125,10 @@ Host pict.oerlikon.madduck.net | pict
   ForwardX11 yes
 #  AddressFamily inet
 
-Host helena.home.mjollnir.org | helena
+Host auge-fr.no-ip.org | auge
   CheckHostIP no
-  Hostname helena.home.mjollnir.org
+  Hostname auge-fr.no-ip.org
+  HostKeyAlias helena.home.mjollnir.org
 
 Host hermia.home.mjollnir.org | hermia | lust.oerlikon.madduck.net | lust
   CheckHostIP no
@@ -125,7 +140,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
@@ -137,13 +152,17 @@ 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
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
+Host zlinli.no-ip.org | zlinli
+  CheckHostIP no
+  Hostname zlinli.no-ip.org
+
 Host debian-community.org | bikeshed.debian-community.org | bikeshed
   Hostname bikeshed.debian-community.org
   User madduck
@@ -162,6 +181,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
@@ -337,9 +359,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