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

diff --git a/.ssh/config.in b/.ssh/config.in
index 75a9188..67b7ccc 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -11,22 +11,74 @@ Host pulse.madduck.net | pulse
 Host svn.madduck.net | svn
   User madduck
   HostKeyAlias pulse.madduck.net
-Host git.madduck.net | git
+Host debian.madduck.net | debian
   User madduck
   HostKeyAlias pulse.madduck.net
   #AddressFamily inet
-Host scratch.madduck.net | scratch
+Host openvpn.madduck.net | openvpn
   User madduck
   HostKeyAlias pulse.madduck.net
   #AddressFamily inet
-Host debian.madduck.net | debian
-  User madduck
+Host backup.madduck.net | backup
   HostKeyAlias pulse.madduck.net
   #AddressFamily inet
-Host openvpn.madduck.net | openvpn
+
+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
+  Hostname wots.madduck.net
+Host buildd.debian.madduck.net | buildd
+  HostKeyAlias wots.madduck.net
+
+Host lotus.madduck.net | lotus
+  ForwardAgent yes
+  Hostname lotus.madduck.net
+Host git.madduck.net | git
+  User git
+  HostKeyAlias lotus.madduck.net
+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 pulse.madduck.net
-  #AddressFamily inet
+  HostKeyAlias sysyphus.madduck.net
+  ForwardAgent yes
+  Port 443
+
+Host jugband.madduck.net | jugband
+  ForwardAgent yes
+  Hostname jugband.madduck.net
+
+Host vera.madduck.net | vera
+  ForwardAgent yes
+  Hostname vera.madduck.net
+
+Host swan-host | swan-host.madduck.net
+  Hostname swan-host.madduck.net
+  User krafft
+
+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 vera.madduck.net
+  ConnectTimeout 60
 
 Host martin-krafft.net
   User madduck
@@ -37,77 +89,106 @@ Host phd.martin-krafft.net
 Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
+Host imap.madduck.net
+  HostKeyAlias seamus.madduck.net
 
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+  Hostname diamond.madduck.net
 Host tunes.madduck.net | tunes
-  Hostname bell.madduck.net
-  HostKeyAlias bell.madduck.net
+  AddressFamily inet
+  ControlMaster no
+  Hostname tunes.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
-#  AddressFamily inet
 
-Host wall.oerlikon.madduck.net | wall
+Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
   CheckHostIP no
   ForwardAgent yes
-  Host wall.oerlikon.madduck.net
-  HostKeyAlias wall.oerlikon.madduck.net
+  ForwardX11 yes
+
+Host wall.gern.madduck.net | wall
+  CheckHostIP no
+  ForwardAgent yes
+  Hostname wall.gern.madduck.net
+
+Host julia.gern.madduck.net | julia
+  Hostname julia.gern.madduck.net
+  ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
   ForwardAgent yes
-  Host embryo.gauting.madduck.net
+  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.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.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 lust.oerlikon.madduck.net | lust | hermia
-  Hostname rscguest.ex.ulcc.ac.uk
-  AddressFamily inet
-  HostKeyAlias hermia.mjollnir.org
+Host nokia-n900.gern.madduck.net | nokia-n900 | n900
   CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  User user
+
+Host auge-fr.no-ip.org | auge
+  CheckHostIP no
+  Hostname auge-fr.no-ip.org
+  HostKeyAlias helena.home.mjollnir.org
 
 Host mother.gauting.madduck.net | mother
   Hostname mother.gauting.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 Host mothere
-  Hostname embryo.madduck.net
+  Hostname embryo.gauting.madduck.net
   Port 22221
   CheckHostIP no
   ForwardAgent yes
@@ -119,32 +200,36 @@ Host brick.gauting.madduck.net | brick
   ForwardAgent yes
   ForwardX11 yes
 Host bricke
-  Hostname embryo.madduck.net
+  Hostname embryo.gauting.madduck.net
   Port 22222
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
+Host zlinli.no-ip.org | zlinli
+  CheckHostIP no
+  Hostname zlinli.no-ip.org
+
 Host debian-community.org | bikeshed.debian-community.org | bikeshed
   Hostname bikeshed.debian-community.org
   User madduck
   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
-
-Host vore.debian.org | vore
-  Hostname vore.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
+Host cvs.debian.org
+  HostKeyAlias vasks.debian.org
+  User madduck
+
 Host malo.debian.org | malo
   Hostname malo.debian.org
   User madduck
@@ -160,9 +245,6 @@ Host saens.debian.org | saens
 Host spohr.debian.org | spohr
   Hostname spohr.debian.org
   User madduck
-Host auric.debian.org | auric
-  Hostname auric.debian.org
-  User madduck
 Host gluck.debian.org | gluck
   Hostname gluck.debian.org
   User madduck
@@ -175,12 +257,6 @@ Host sarti.debian.org | sarti
 Host europa.debian.org | europa
   Hostname europa.debian.org
   User madduck
-Host goedel.debian.org | goedel
-  Hostname goedel.debian.org
-  User madduck
-Host casals.debian.org | casals
-  Hostname casals.debian.org
-  User madduck
 Host master.debian.org | master
   Hostname master.debian.org
   User madduck
@@ -196,9 +272,6 @@ Host merkel.debian.org | merkel
 Host murphy.debian.org | murphy
   Hostname murphy.debian.org
   User madduck
-Host escher.debian.org | escher
-  Hostname escher.debian.org
-  User madduck
 Host raptor.debian.org | raptor
   Hostname raptor.debian.org
   User madduck
@@ -211,9 +284,6 @@ Host raff.debian.org | raff
 Host klecker.debian.org | klecker
   Hostname klecker.debian.org
   User madduck
-Host vaughan.debian.org | vaughan
-  Hostname vaughan.debian.org
-  User madduck
 Host voltaire.debian.org | voltaire
   Hostname voltaire.debian.org
   User madduck
@@ -223,9 +293,6 @@ Host bruckner.debian.org | bruckner
 Host kullervo.debian.org | kullervo
   Hostname kullervo.debian.org
   User madduck
-Host kullervo.debian.org | kullervo
-  Hostname kullervo.debian.org
-  User madduck
 Host samosa.debian.org | samosa
   Hostname samosa.debian.org
   User madduck
@@ -262,6 +329,12 @@ Host peri.debian.org | peri
 Host lobos.debian.org | lobos
   Hostname lobos.debian.org
   User madduck
+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
@@ -271,6 +344,9 @@ Host ries.debian.org | ries
 Host goetz.debian.org | goetz
   Hostname goetz.debian.org
   User madduck
+Host ravel.debian.org | ravel
+  Hostname ravel.debian.org
+  User madduck
 Host rietz.debian.org | rietz
   Hostname rietz.debian.org
   User madduck
@@ -310,6 +386,34 @@ Host argento.debian.org | argento
 Host allegri.debian.org | allegri
   Hostname allegri.debian.org
   User madduck
+Host morales.debian.org | morales
+  Hostname morales.debian.org
+  User madduck
+Host auber.debian.org | auber
+  Hostname auber.debian.org
+  User madduck
+Host mahler.debian.org | mahler
+  Hostname mahler.debian.org
+  User madduck
+Host schroeder.debian.org | schroeder
+  Hostname schroeder.debian.org
+  User madduck
+Host powell.debian.org | powell
+  Hostname powell.debian.org
+  User madduck
+Host rem.debian.org | rem
+  Hostname rem.debian.org
+  User madduck
+Host smetana.debian.org | smetana
+  Hostname smetana.debian.org
+  User madduck
+Host bellini.debian.org | bellini
+  Hostname bellini.debian.org
+  User madduck
+
+Host people.debian.org
+  HostKeyAlias ravel.debian.org
+  User madduck
 
 Host sergei.ifi.uzh.ch | sergei
   Hostname sergei.ifi.uzh.ch
@@ -317,6 +421,24 @@ 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
@@ -331,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
@@ -375,4 +498,5 @@ Host *
 # UsePrivilegedPort no
 # UserKnownHostsFile ~/.ssh/known_hosts
 # VerifyHostKeyDNS no
+  VisualHostKey no
 # XAuthLocation /usr/X11R6/bin/xauth