remove hosts I do not use anymore

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index ba1fbb14458b8b610532d21a27dfc3ec84d2d0b7..92a46d6a25ddda0ff305dcb408315e2f1509bfcf 100644 (file)
--- 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
@@ -96,6 +100,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
@@ -115,8 +127,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
@@ -129,7 +141,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,18 +149,17 @@ Host pipere
   ForwardX11 yes
   HostKeyAlias piper.oerlikon.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.oerlikon.madduck.net
+Host albatross.oerlikon.madduck.net | albatross
+  Hostname albatross.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
-Host diamonde
+Host albatrosse
   Hostname wall.oerlikon.madduck.net
-  Port 22224
+  Port 22223
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias diamond.oerlikon.madduck.net
+  HostKeyAlias albatross.oerlikon.madduck.net
 
 Host pict.oerlikon.madduck.net | pict
   Hostname pict.oerlikon.madduck.net
@@ -168,11 +178,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
@@ -397,9 +402,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
@@ -414,6 +416,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
@@ -423,6 +428,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
@@ -436,6 +444,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no