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

diff --git a/.ssh/config.in b/.ssh/config.in
index da1af08..c3d91ff 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -46,13 +46,20 @@ Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
 Host git.madduck.net | git
-  User madduck
+  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
@@ -61,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
@@ -73,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
@@ -83,6 +96,14 @@ Host tunes.madduck.net | tunes
   Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+  Hostname diamond.madduck.net
+
+Host shelter.madduck.net | shelter
+  ForwardAgent yes
+  Hostname shelter.madduck.net
+
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
   Hostname sheep.umverkehr.ch
   User madduck
@@ -91,15 +112,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
@@ -121,24 +146,17 @@ Host pipere
   ForwardX11 yes
   HostKeyAlias piper.oerlikon.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.oerlikon.madduck.net
+Host pict.oerlikon.madduck.net | pict
+  Hostname pict.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 #  AddressFamily inet
-Host diamonde
-  Hostname wall.oerlikon.madduck.net
-  Port 22224
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias diamond.oerlikon.madduck.net
 
-Host pict.oerlikon.madduck.net | pict
-  Hostname pict.oerlikon.madduck.net
+Host nokia-n900.oerlikon.madduck.net | nokia-n900 | n900
+  CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
+  User user
 
 Host auge-fr.no-ip.org | auge
   CheckHostIP no
@@ -400,6 +418,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
@@ -413,6 +434,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no