X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/1f32d2f479b305e57f3ce99939d9bc9355a235bb..db2d44ebaf3dd0b4c2d4b4f919816c3dfc74c0fc:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 31e05cb..67b7ccc 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -11,10 +11,6 @@ Host pulse.madduck.net | pulse
 Host svn.madduck.net | svn
   User madduck
   HostKeyAlias pulse.madduck.net
-Host scratch.madduck.net | scratch
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
 Host debian.madduck.net | debian
   User madduck
   HostKeyAlias pulse.madduck.net
@@ -23,11 +19,6 @@ Host openvpn.madduck.net | openvpn
   User madduck
   HostKeyAlias pulse.madduck.net
   #AddressFamily inet
-Host ssh443.madduck.net | ssh443
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  ForwardAgent yes
-  Port 443
 Host backup.madduck.net | backup
   HostKeyAlias pulse.madduck.net
   #AddressFamily inet
@@ -35,6 +26,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
@@ -52,6 +47,15 @@ Host git.debian.ch
   User git
   HostKeyAlias lotus.madduck.net
 
+Host sysyphus.madduck.net | sysyphus
+  ForwardAgent yes
+  Hostname sysyphus.madduck.net
+Host ssh443.madduck.net | ssh443
+  User madduck
+  HostKeyAlias sysyphus.madduck.net
+  ForwardAgent yes
+  Port 443
+
 Host jugband.madduck.net | jugband
   ForwardAgent yes
   Hostname jugband.madduck.net
@@ -73,7 +77,8 @@ Host domine.madduck.net | domine
   Hostname domine.madduck.net
 
 Host irc
-  Hostname bell.madduck.net
+  Hostname vera.madduck.net
+  ConnectTimeout 60
 
 Host martin-krafft.net
   User madduck
@@ -87,40 +92,48 @@ Host 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 flics.madduck.net | flics
+  AddressFamily inet
+  ControlMaster no
+  Hostname flics.madduck.net
+  HostKeyAlias diamond.madduck.net
+Host scratch.madduck.net | scratch
+  User madduck
+  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
   User madduck
 
-Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
+Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
 
-Host fishbowl.rw.madduck.net | fishbowl.oerlikon.madduck.net | fishbowl
+Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
 
-Host wall.oerlikon.madduck.net | wall
+Host wall.gern.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
-  Hostname wall.oerlikon.madduck.net
+  Hostname wall.gern.madduck.net
 
-Host vizier.oerlikon.madduck.net | vizier
-  Hostname vizier.oerlikon.madduck.net
-  ForwardAgent yes
-
-Host julia.oerlikon.madduck.net | julia
-  Hostname julia.oerlikon.madduck.net
+Host julia.gern.madduck.net | julia
+  Hostname julia.gern.madduck.net
   ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
@@ -129,39 +142,37 @@ Host embryo.gauting.madduck.net | embryo
   Hostname embryo.gauting.madduck.net
   HostKeyAlias embryo.gauting.madduck.net
 
-Host piper.oerlikon.madduck.net | piper
-  Hostname piper.oerlikon.madduck.net
+Host piper.gern.madduck.net | piper
+  Hostname piper.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
 Host pipere
-  Hostname wall.oerlikon.madduck.net
+  Hostname wall.gern.madduck.net
   Port 22223
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias piper.oerlikon.madduck.net
+  HostKeyAlias piper.gern.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.oerlikon.madduck.net
+Host albatross.gern.madduck.net | albatross
+  Hostname albatross.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
-Host diamonde
-  Hostname wall.oerlikon.madduck.net
+Host albatrosse
+  Hostname wall.gern.madduck.net
   Port 22224
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias diamond.oerlikon.madduck.net
+  HostKeyAlias albatross.gern.madduck.net
 
-Host pict.oerlikon.madduck.net | pict
-  Hostname pict.oerlikon.madduck.net
+Host pict.gern.madduck.net | pict
+  Hostname pict.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 #  AddressFamily inet
 
-Host nokia-n900.oerlikon.madduck.net | nokia-n900 | n900
+Host nokia-n900.gern.madduck.net | nokia-n900 | n900
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -172,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
@@ -211,20 +217,17 @@ Host debian-community.org | bikeshed.debian-community.org | bikeshed
   ForwardAgent no
   ForwardX11 no
 
-Host alioth.debian.org | alioth
-  Hostname alioth.debian.org
-  User madduck
 Host svn.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
 Host git.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
 Host hg.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
 Host cvs.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
 
 Host malo.debian.org | malo
@@ -329,6 +332,9 @@ Host lobos.debian.org | lobos
 Host wagner.debian.org | wagner
   Hostname wagner.debian.org
   User madduck
+Host vasks.debian.org | vasks
+  Hostname vasks.debian.org
+  User madduck
 Host verdi.debian.org | verdi
   Hostname verdi.debian.org
   User madduck
@@ -401,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
@@ -418,15 +421,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
@@ -440,6 +453,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no