X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/9a3c77c55b06d43875578970d9b84c6b2120954c..b2753d37469a5400b348be0cfd44a6ecaeb92cd9:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 48571e7..da1af08 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -11,10 +11,6 @@ Host pulse.madduck.net | pulse
 Host svn.madduck.net | svn
   User madduck
   HostKeyAlias pulse.madduck.net
-Host git.madduck.net | git
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias pulse.madduck.net
@@ -40,14 +36,34 @@ Host khyber.madduck.net | khyber
   ForwardAgent yes
   Hostname khyber.madduck.net
 
+Host wots.madduck.net | wots
+  ForwardAgent yes
+  Hostname wots.madduck.net
+Host buildd.debian.madduck.net | buildd
+  HostKeyAlias wots.madduck.net
+
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
+Host git.madduck.net | git
+  User madduck
+  HostKeyAlias 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 irc
+  Hostname mjollnir.org
+
 Host martin-krafft.net
   User madduck
   HostKeyAlias seamus.madduck.net
@@ -58,8 +74,13 @@ Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
 
-Host tunes.madduck.net | tunes
+Host bell.madduck.net | bell
+  ForwardAgent yes
   Hostname bell.madduck.net
+Host tunes.madduck.net | tunes
+  AddressFamily inet
+  ControlMaster no
+  Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
@@ -93,7 +114,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 +127,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 +196,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,9 +377,8 @@ Host smetana.debian.org | smetana
 Host strauss.debian.net | strauss
   Hostname strauss.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
@@ -369,8 +392,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