X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/d85a709e5e7f72cf230255e465edb26a7238e9dd..810e56ab249e7ce5d47fd5f080f0df827b3aea89:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index bb167d1..be47746 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
@@ -49,11 +45,21 @@ Host buildd.debian.madduck.net | buildd
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
+Host git.madduck.net | git
+  User git
+  HostKeyAlias lotus.madduck.net
+Host git.debian.ch
+  User git
+  HostKeyAlias lotus.madduck.net
 
 Host jugband.madduck.net | jugband
   ForwardAgent yes
   Hostname jugband.madduck.net
 
+Host vera.madduck.net | vera
+  ForwardAgent yes
+  Hostname vera.madduck.net
+
 Host swan-host | swan-host.madduck.net
   Hostname swan-host.madduck.net
   User krafft
@@ -62,8 +68,12 @@ Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
 
+Host domine.madduck.net | domine
+  ForwardAgent yes
+  Hostname domine.madduck.net
+
 Host irc
-  Hostname mjollnir.org
+  Hostname bell.madduck.net
 
 Host martin-krafft.net
   User madduck
@@ -74,6 +84,8 @@ Host phd.martin-krafft.net
 Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
+Host imap.madduck.net
+  HostKeyAlias seamus.madduck.net
 
 Host bell.madduck.net | bell
   ForwardAgent yes
@@ -84,6 +96,10 @@ Host tunes.madduck.net | tunes
   Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
+Host vizier.madduck.net | vizier
+  Hostname vizier.madduck.net
+  ForwardAgent yes
+
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
   Hostname sheep.umverkehr.ch
   User madduck
@@ -92,15 +108,19 @@ Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
+
+Host fishbowl.rw.madduck.net | fishbowl.oerlikon.madduck.net | fishbowl
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
 
 Host wall.oerlikon.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
   Hostname wall.oerlikon.madduck.net
 
-Host vizier.oerlikon.madduck.net | vizier
-  Hostname vizier.oerlikon.madduck.net
+Host julia.oerlikon.madduck.net | julia
+  Hostname julia.oerlikon.madduck.net
   ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
@@ -141,6 +161,12 @@ Host pict.oerlikon.madduck.net | pict
   ForwardX11 yes
 #  AddressFamily inet
 
+Host nokia-n900.oerlikon.madduck.net | nokia-n900 | n900
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  User user
+
 Host auge-fr.no-ip.org | auge
   CheckHostIP no
   Hostname auge-fr.no-ip.org
@@ -401,6 +427,9 @@ Host skynet.skynet.ie | skynet.ie | skynet
   Hostname skynet.skynet.ie
   User madduck
 
+Host aika.krafftwerk.de | aika
+  Hostname aika.krafftwerk.de
+
 Host *
 # AddressFamily any
 # BatchMode no