X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/e10bccd9813d258876e84a3ca97f689bf0baaaef..4033b53cdbb9e223e494e79cd883b451938c9996:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index e481c1e..1d0609c 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -73,7 +73,7 @@ Host domine.madduck.net | domine
   Hostname domine.madduck.net
 
 Host irc
-  Hostname bell.madduck.net
+  Hostname vera.madduck.net
 
 Host martin-krafft.net
   User madduck
@@ -96,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
@@ -129,7 +137,6 @@ Host piper.oerlikon.madduck.net | piper
   Hostname piper.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
 Host pipere
   Hostname wall.oerlikon.madduck.net
   Port 22223
@@ -138,6 +145,18 @@ Host pipere
   ForwardX11 yes
   HostKeyAlias piper.oerlikon.madduck.net
 
+Host albatross.oerlikon.madduck.net | albatross
+  Hostname albatross.oerlikon.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+Host albatrosse
+  Hostname wall.oerlikon.madduck.net
+  Port 22223
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias albatross.oerlikon.madduck.net
+
 Host pict.oerlikon.madduck.net | pict
   Hostname pict.oerlikon.madduck.net
   ForwardAgent yes
@@ -401,6 +420,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
@@ -426,6 +448,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no