X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/00eb58b1182921d013f63018379b3877793173b3..5cc7929667c3c42df51c930b9108d813f25d17c6:/.ssh/config.in?ds=inline;pf=etc

diff --git a/.ssh/config.in b/.ssh/config.in
index f3d0e80..96eb07f 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -96,9 +96,13 @@ Host tunes.madduck.net | tunes
   Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
-Host vizier.madduck.net | vizier
-  Hostname vizier.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
@@ -142,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 +409,9 @@ Host sergei.ifi.uzh.ch | sergei
 Host nikolai.ifi.uzh.ch | nikolai
   Hostname nikolai.ifi.uzh.ch
   User krafft
+Host franz.ifi.uzh.ch | franz
+  Hostname franz.ifi.uzh.ch
+  User krafft
 
 Host clegg-host | clegg-host.madduck.net | gratis2.opro.ch | opro
   Hostname clegg-host.madduck.net
@@ -427,6 +421,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
@@ -440,6 +437,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no