X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/678592b0908de37f3e4832341a94ae44f5c96a0f..4433785b20ae3c31d13399f2d9dd6c5d64182e60:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 6d9ae09..00e06c3 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -59,7 +59,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
@@ -93,7 +95,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
@@ -106,7 +108,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
@@ -175,6 +177,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
@@ -353,12 +358,8 @@ Host smetana.debian.org | smetana
 Host strauss.debian.net | strauss
   Hostname strauss.debian.net
   User madduck
-Host bellini.debian.net | bellini
-  Hostname bellini.debian.net
-  User madduck
-
-Host cvs.debian.org
-  HostKeyAlias gluck.debian.org
+Host bellini.debian.org | bellini
+  Hostname bellini.debian.org
   User madduck
 
 Host people.debian.org