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

diff --git a/.ssh/config.in b/.ssh/config.in
index f126667..c3d91ff 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -48,6 +48,9 @@ Host lotus.madduck.net | lotus
 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
@@ -81,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
@@ -91,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
@@ -110,8 +123,8 @@ Host wall.oerlikon.madduck.net | wall
   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
@@ -133,19 +146,6 @@ Host pipere
   ForwardX11 yes
   HostKeyAlias piper.oerlikon.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.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
   ForwardAgent yes
@@ -418,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
@@ -431,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