X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/75ac72fc100a501d2fce49b08d845d2dfa254008..5d79a6407e4601ce1e6e745ba80641888677c163:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index d3a0ceb..2fcb4db 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -35,6 +35,10 @@ Host backup.madduck.net | backup
 Host khyber.madduck.net | khyber
   ForwardAgent yes
   Hostname khyber.madduck.net
+Host khyber-vnc
+  ControlMaster no
+  ControlPath none
+  Hostname khyber.madduck.net
 
 Host wots.madduck.net | wots
   ForwardAgent yes
@@ -73,7 +77,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
@@ -90,15 +94,24 @@ Host imap.madduck.net
 Host bell.madduck.net | bell
   ForwardAgent yes
   Hostname bell.madduck.net
+
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+  Hostname diamond.madduck.net
 Host tunes.madduck.net | tunes
   AddressFamily inet
   ControlMaster no
   Hostname tunes.madduck.net
-  HostKeyAlias bell.madduck.net
+  HostKeyAlias diamond.madduck.net
+Host flics.madduck.net | flics
+  AddressFamily inet
+  ControlMaster no
+  Hostname flics.madduck.net
+  HostKeyAlias diamond.madduck.net
 
-Host vizier.madduck.net | vizier
-  Hostname vizier.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
@@ -133,7 +146,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
@@ -142,6 +154,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
@@ -159,11 +183,6 @@ Host auge-fr.no-ip.org | auge
   Hostname auge-fr.no-ip.org
   HostKeyAlias helena.home.mjollnir.org
 
-Host hermia.home.mjollnir.org | hermia | lust.oerlikon.madduck.net | lust
-  CheckHostIP no
-  ForwardX11 yes
-  HostKeyAlias hermia.home.mjollnir.org
-
 Host mother.gauting.madduck.net | mother
   Hostname mother.gauting.madduck.net
   ForwardAgent yes
@@ -388,9 +407,6 @@ Host rem.debian.org | rem
 Host smetana.debian.org | smetana
   Hostname smetana.debian.org
   User madduck
-Host strauss.debian.net | strauss
-  Hostname strauss.debian.net
-  User madduck
 Host bellini.debian.org | bellini
   Hostname bellini.debian.org
   User madduck
@@ -405,6 +421,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
@@ -430,6 +449,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no