bell is dead

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

diff --git a/.ssh/config.in b/.ssh/config.in
index 80deb1e3c11afad4e4b18bb47bd58ccff872af72..14ccc50f188c9674b6ce14cea90b0aa895fc6d9d 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
@@ -48,6 +52,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
@@ -65,8 +72,12 @@ Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
 
+Host domine.madduck.net | domine
+  ForwardAgent yes
+  Hostname domine.madduck.net
+
 Host irc
-  Hostname bell.madduck.net
+  Hostname vera.madduck.net
 
 Host martin-krafft.net
   User madduck
@@ -77,15 +88,21 @@ 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
+Host diamond.madduck.net | diamond
   ForwardAgent yes
-  Hostname bell.madduck.net
+  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 shelter.madduck.net | shelter
+  ForwardAgent yes
+  Hostname shelter.madduck.net
 
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
   Hostname sheep.umverkehr.ch
@@ -95,15 +112,19 @@ Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
+
+Host fishbowl.rw.madduck.net | fishbowl.oerlikon.madduck.net | fishbowl
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
 
 Host wall.oerlikon.madduck.net | wall
   CheckHostIP no
   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
@@ -116,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
@@ -125,18 +145,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
   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
@@ -155,11 +174,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
@@ -384,9 +398,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
@@ -401,15 +412,25 @@ 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
   User madduck
 
+Host arnold-host | arnold-host.madduck.net
+  Hostname arnold-host.madduck.net
+  User xen05
+
 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
@@ -423,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