X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/9dd62239d244cfb2b487febad915ef227fcc12aa..c89093a69b18cc10247693e2a39e92b5864b62e8:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index 028e04f..831ff70 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -4,122 +4,212 @@ Host 127.0.0.1 | localhost
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
-Host pulse.madduck.net | pulse
+### CHARADE KVM HOST
+
+Host charade.madduck.net | charade
   ForwardAgent yes
-  Hostname pulse.madduck.net
-  #AddressFamily inet
-Host svn.madduck.net | svn
-  User madduck
-  HostKeyAlias pulse.madduck.net
-Host git.madduck.net | git
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
-Host scratch.madduck.net | scratch
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
-Host debian.madduck.net | debian
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
-Host openvpn.madduck.net | openvpn
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
-Host ssh443.madduck.net | ssh443
-  User madduck
-  HostKeyAlias pulse.madduck.net
+  Hostname charade.madduck.net
+Host charade-vnc
+  ControlMaster no
+  ControlPath none
+  Hostname charade.madduck.net
+
+Host emily.madduck.net | emily
   ForwardAgent yes
-  Port 443
-Host backup.madduck.net | backup
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
+  Hostname emily.madduck.net
+
+Host matilda.madduck.net | matilda
+  ForwardAgent yes
+  Hostname matilda.madduck.net
+
+Host vizier.madduck.net | vizier
+  ForwardAgent yes
+  Hostname vizier.madduck.net
+Host admin.madduck.net | admin
+  Hostname admin.madduck.net
+  HostKeyAlias vizier.madduck.net
+  User git
+
+Host ambassador.madduck.net | ambassador
+  ForwardAgent yes
+  Hostname ambassador.madduck.net
+
+### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
   ForwardAgent yes
   Hostname khyber.madduck.net
+Host khyber-vnc
+  ControlMaster no
+  ControlPath none
+  Hostname khyber.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 martin-krafft.net
   User madduck
-  HostKeyAlias seamus.madduck.net
+  HostKeyAlias lotus.madduck.net
 Host phd.martin-krafft.net
   User madduck
-  HostKeyAlias seamus.madduck.net
+  HostKeyAlias lotus.madduck.net
 Host madduck.net
   User madduck
-  HostKeyAlias seamus.madduck.net
+  HostKeyAlias lotus.madduck.net
 
-Host tunes.madduck.net | tunes
-  Hostname bell.madduck.net
-  HostKeyAlias bell.madduck.net
+Host jugband.madduck.net | jugband
+  ForwardAgent yes
+  Hostname jugband.madduck.net
+
+Host domine.madduck.net | domine
+  ForwardAgent yes
+  Hostname domine.madduck.net
+Host imap.madduck.net
+  HostKeyAlias domine.madduck.net
+
+Host aika.krafftwerk.de | aika
+  Hostname aika.krafftwerk.de
+
+Host sysyphus.madduck.net | sysyphus
+  ForwardAgent yes
+  Hostname sysyphus.madduck.net
+Host ssh443.madduck.net | ssh443
+  HostKeyAlias sysyphus.madduck.net
+  ForwardAgent yes
+  Port 443
+Host openvpn.madduck.net | openvpn
+  HostKeyAlias sysyphus.madduck.net
+
+Host wots.madduck.net | wots
+  ForwardAgent yes
+  Hostname wots.madduck.net
+Host buildd.debian.madduck.net | buildd
+  HostKeyAlias wots.madduck.net
+
+### UNI ZURICH MACHINES
 
-Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
-  Hostname sheep.umverkehr.ch
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+  Hostname diamond.madduck.net
+Host debian.madduck.net | debian
+  HostKeyAlias diamond.madduck.net
+Host scratch.madduck.net | scratch
   User madduck
+  HostKeyAlias diamond.madduck.net
+Host tunes.madduck.net | tunes
+  AddressFamily inet
+  ControlMaster no
+  Hostname tunes.madduck.net
+  HostKeyAlias diamond.madduck.net
+  IPQoS lowdelay af13
+Host flics.madduck.net | flics
+  AddressFamily inet
+  ControlMaster no
+  Hostname flics.madduck.net
+  HostKeyAlias diamond.madduck.net
+  IPQoS lowdelay af13
 
-Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
-  CheckHostIP no
+Host shelter.madduck.net | shelter
   ForwardAgent yes
-  ForwardX11 yes
-#  AddressFamily inet
+  Hostname shelter.madduck.net
+Host backup.madduck.net | backup
+  HostKeyAlias shelter.madduck.net
 
-Host wall.oerlikon.madduck.net | wall
-  CheckHostIP no
+Host sergei.ifi.uzh.ch | sergei
+  Hostname sergei.ifi.uzh.ch
+  User krafft
+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
+
+### SWAN / BYTEMARK
+
+Host swan-host | swan-host.madduck.net
+  Hostname swan-host.madduck.net
+  User krafft
+
+Host swan.madduck.net | swan
   ForwardAgent yes
-  Hostname wall.oerlikon.madduck.net
-  HostKeyAlias wall.oerlikon.madduck.net
+  Hostname swan.madduck.net
 
-Host embryo.gauting.madduck.net | embryo
-  CheckHostIP no
+Host pulse.madduck.net | pulse
   ForwardAgent yes
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
+  Hostname pulse.madduck.net
+
+### ARNOLD / GPLHOST
 
-Host piper.oerlikon.madduck.net | piper
-  Hostname piper.oerlikon.madduck.net
+Host arnold.madduck.net | arnold
   ForwardAgent yes
-  ForwardX11 yes
-#  AddressFamily inet
-Host pipere
-  Hostname wall.madduck.net
-  Port 22223
+  Hostname arnold.madduck.net
+Host arnold-host | arnold-host.madduck.net
+  Hostname arnold-host.madduck.net
+  User xen05
+Host irc
+  User madduck
+  Hostname arnold.madduck.net
+  ConnectTimeout 60
+
+### GERN
+
+Host wall.gern.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias piper.oerlikon.madduck.net
+  Hostname wall.gern.madduck.net
+
+Host julia.gern.madduck.net | julia
+  Hostname julia.gern.madduck.net
+  ForwardAgent yes
+
+Host git.gern.madduck.net | git.gern
+  ForwardAgent yes
+  HostKeyAlias julia.gern.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.oerlikon.madduck.net
+Host pict.gern.madduck.net | pict
+  Hostname pict.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
-Host diamonde
-  Hostname wall.madduck.net
-  Port 22224
+
+Host visitor*.gern.madduck.net | visitor*.gern | visitor*
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### LEHEL
+
+Host clegg.lehel.madduck.net | clegg.lehel | clegg
   CheckHostIP no
   ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias diamond.oerlikon.madduck.net
+  Hostname clegg.lehel.madduck.net
 
-Host pict.oerlikon.madduck.net | pict
-  Hostname pict.oerlikon.madduck.net
+Host albatross.lehel.madduck.net | albatross.lehel | albatross
+  Hostname albatross.lehel.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
+  HostKeyAlias albatross.lehel
 
-Host lust.oerlikon.madduck.net | lust | hermia
-  HostKeyAlias hermia.mjollnir.org
-  ForwardX11 yes
+### GAUTING
+
+Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
+  ForwardAgent yes
+  Hostname embryo.gauting.madduck.net
+  HostKeyAlias embryo.gauting.madduck.net
 
-Host mother.gauting.madduck.net | mother
-  Hostname mother.gauting.madduck.net
+Host mother.gauting | mother | mother.gauting.madduck.net
+  Hostname mother.gauting
   ForwardAgent yes
   ForwardX11 yes
 Host mothere
-  Hostname embryo.madduck.net
-  Port 22221
+  Hostname embryo.gauting.madduck.net
+  Port 22021
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -130,230 +220,675 @@ 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 debian-community.org | bikeshed.debian-community.org | bikeshed
-  Hostname bikeshed.debian-community.org
-  User madduck
-  ForwardAgent no
-  ForwardX11 no
+### MOUNT VICTORIA
+
+Host atom.mtvic.madduck.net | atom.mtvic | atom
+  Hostname atom.mtvic.madduck.net
+  ForwardAgent yes
+
+### ROAD WARRIORS
 
-Host alioth.debian.org | alioth
-  Hostname alioth.debian.org
+Host fishbowl | fishbowl.gern | fishbowl.lehel
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias fishbowl
+  CanonicalizeHostname yes
+  CanonicalizeMaxDots 0
+  CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
+
+### DEBIAN
+
+Host scm.alioth.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host svn.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host git.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host hg.debian.org
-  HostKeyAlias alioth.debian.org
+  HostKeyAlias moszumanska.debian.org
+  User madduck
+Host cvs.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 
-Host malo.debian.org | malo
-  Hostname malo.debian.org
+Host people.debian.org | people
+  Hostname people.debian.org
+  HostKeyAlias paradis.debian.org
   User madduck
-Host paer.debian.org | paer
-  Hostname paer.debian.org
+
+Host abel.debian.org | abel
+  Hostname abel.debian.org
   User madduck
-Host crest.debian.org | crest
-  Hostname crest.debian.org
+Host adayevskaya.debian.org | adayevskaya
+  Hostname adayevskaya.debian.org
   User madduck
-Host saens.debian.org | saens
-  Hostname saens.debian.org
+Host alkman.debian.org | alkman
+  Hostname alkman.debian.org
   User madduck
-Host spohr.debian.org | spohr
-  Hostname spohr.debian.org
+Host alwyn.debian.org | alwyn
+  Hostname alwyn.debian.org
+  User madduck
+Host ancina.debian.org | ancina
+  Hostname ancina.debian.org
+  User madduck
+Host antheil.debian.org | antheil
+  Hostname antheil.debian.org
+  User madduck
+Host arnold.debian.org
+  Hostname arnold.debian.org
+  User madduck
+Host asdfasdf.debian.net | asdfasdf
+  Hostname asdfasdf.debian.net
+  User madduck
+Host babin.debian.org | babin
+  Hostname babin.debian.org
+  User madduck
+Host backuphost.debian.org | backuphost
+  Hostname backuphost.debian.org
+  User madduck
+Host ball.debian.org | ball
+  Hostname ball.debian.org
+  User madduck
+Host barber.debian.org | barber
+  Hostname barber.debian.org
+  User madduck
+Host barriere.debian.org | barriere
+  Hostname barriere.debian.org
+  User madduck
+Host beach.debian.org | beach
+  Hostname beach.debian.org
+  User madduck
+Host beethoven.debian.org | beethoven
+  Hostname beethoven.debian.org
+  User madduck
+Host bendel.debian.org | bendel
+  Hostname bendel.debian.org
+  User madduck
+Host berlioz.debian.org | berlioz
+  Hostname berlioz.debian.org
+  User madduck
+Host bertali.debian.org | bertali
+  Hostname bertali.debian.org
+  User madduck
+Host biber.debian.org | biber
+  Hostname biber.debian.org
+  User madduck
+Host binet.debian.org | binet
+  Hostname binet.debian.org
+  User madduck
+Host bizet.debian.org | bizet
+  Hostname bizet.debian.org
+  User madduck
+Host blavet.debian.org | blavet
+  Hostname blavet.debian.org
+  User madduck
+Host bm-bl1.debian.org | bm-bl1
+  Hostname bm-bl1.debian.org
+  User madduck
+Host bm-bl10.debian.org | bm-bl10
+  Hostname bm-bl10.debian.org
+  User madduck
+Host bm-bl11.debian.org | bm-bl11
+  Hostname bm-bl11.debian.org
+  User madduck
+Host bm-bl12.debian.org | bm-bl12
+  Hostname bm-bl12.debian.org
+  User madduck
+Host bm-bl2.debian.org | bm-bl2
+  Hostname bm-bl2.debian.org
+  User madduck
+Host bm-bl3.debian.org | bm-bl3
+  Hostname bm-bl3.debian.org
+  User madduck
+Host bm-bl4.debian.org | bm-bl4
+  Hostname bm-bl4.debian.org
+  User madduck
+Host bm-bl5.debian.org | bm-bl5
+  Hostname bm-bl5.debian.org
+  User madduck
+Host bm-bl6.debian.org | bm-bl6
+  Hostname bm-bl6.debian.org
+  User madduck
+Host bm-bl7.debian.org | bm-bl7
+  Hostname bm-bl7.debian.org
+  User madduck
+Host bm-bl8.debian.org | bm-bl8
+  Hostname bm-bl8.debian.org
+  User madduck
+Host bm-bl9.debian.org | bm-bl9
+  Hostname bm-bl9.debian.org
+  User madduck
+Host bmdb1.debian.org | bmdb1
+  Hostname bmdb1.debian.org
+  User madduck
+Host boito.debian.org | boito
+  Hostname boito.debian.org
+  User madduck
+Host brahms.debian.org | brahms
+  Hostname brahms.debian.org
+  User madduck
+Host busoni.debian.org | busoni
+  Hostname busoni.debian.org
+  User madduck
+Host buxtehude.debian.org | buxtehude
+  Hostname buxtehude.debian.org
+  User madduck
+Host byrd.debian.org | byrd
+  Hostname byrd.debian.org
+  User madduck
+Host caballero.debian.org | caballero
+  Hostname caballero.debian.org
+  User madduck
+Host chopin.debian.org | chopin
+  Hostname chopin.debian.org
+  User madduck
+Host clementi.debian.org | clementi
+  Hostname clementi.debian.org
+  User madduck
+Host coccia.debian.org | coccia
+  Hostname coccia.debian.org
+  User madduck
+Host corelli.debian.org | corelli
+  Hostname corelli.debian.org
+  User madduck
+Host couper.debian.org | couper
+  Hostname couper.debian.org
+  User madduck
+Host czerny.debian.org | czerny
+  Hostname czerny.debian.org
+  User madduck
+Host danzi.debian.org | danzi
+  Hostname danzi.debian.org
+  User madduck
+Host delfin.debian.org | delfin
+  Hostname delfin.debian.org
+  User madduck
+Host denis.debian.org | denis
+  Hostname denis.debian.org
+  User madduck
+Host diabelli.debian.org | diabelli
+  Hostname diabelli.debian.org
+  User madduck
+Host dijkstra.debian.org | dijkstra
+  Hostname dijkstra.debian.org
+  User madduck
+Host dillon.debian.org | dillon
+  Hostname dillon.debian.org
+  User madduck
+Host dinis.debian.org | dinis
+  Hostname dinis.debian.org
+  User madduck
+Host donizetti.debian.org | donizetti
+  Hostname donizetti.debian.org
+  User madduck
+Host draghi.debian.org | draghi
+  Hostname draghi.debian.org
+  User madduck
+Host dukas.debian.org | dukas
+  Hostname dukas.debian.org
+  User madduck
+Host eberlin.debian.org | eberlin
+  Hostname eberlin.debian.org
+  User madduck
+Host eder.debian.org | eder
+  Hostname eder.debian.org
+  User madduck
+Host elgar.debian.org | elgar
+  Hostname elgar.debian.org
+  User madduck
+Host exodar.debian.net | exodar
+  Hostname exodar.debian.net
+  User madduck
+Host eysler.debian.org | eysler
+  Hostname eysler.debian.org
+  User madduck
+Host falla.debian.org | falla
+  Hostname falla.debian.org
+  User madduck
+Host fano.debian.org | fano
+  Hostname fano.debian.org
+  User madduck
+Host fayrfax.debian.org | fayrfax
+  Hostname fayrfax.debian.org
+  User madduck
+Host fils.debian.org | fils
+  Hostname fils.debian.org
+  User madduck
+Host finzi.debian.org | finzi
+  Hostname finzi.debian.org
+  User madduck
+Host fischer.debian.org | fischer
+  Hostname fischer.debian.org
+  User madduck
+Host franck.debian.org | franck
+  Hostname franck.debian.org
+  User madduck
+Host gabrielli.debian.org | gabrielli
+  Hostname gabrielli.debian.org
+  User madduck
+Host geo1.debian.org | geo1
+  Hostname geo1.debian.org
+  User madduck
+Host geo2.debian.org | geo2
+  Hostname geo2.debian.org
+  User madduck
+Host geo3.debian.org | geo3
+  Hostname geo3.debian.org
+  User madduck
+Host glinka.debian.org | glinka
+  Hostname glinka.debian.org
   User madduck
 Host gluck.debian.org | gluck
   Hostname gluck.debian.org
   User madduck
-Host elara.debian.org | elara
-  Hostname elara.debian.org
+Host gombert.debian.org | gombert
+  Hostname gombert.debian.org
   User madduck
-Host sarti.debian.org | sarti
-  Hostname sarti.debian.org
+Host handel.debian.org | handel
+  Hostname handel.debian.org
   User madduck
-Host europa.debian.org | europa
-  Hostname europa.debian.org
+Host harris.debian.org | harris
+  Hostname harris.debian.org
   User madduck
-Host master.debian.org | master
-  Hostname master.debian.org
+Host hartmann.debian.org | hartmann
+  Hostname hartmann.debian.org
   User madduck
-Host bartok.debian.org | bartok
-  Hostname bartok.debian.org
+Host hasse.debian.org | hasse
+  Hostname hasse.debian.org
   User madduck
-Host merulo.debian.org | merulo
-  Hostname merulo.debian.org
+Host henze.debian.org | henze
+  Hostname henze.debian.org
   User madduck
-Host merkel.debian.org | merkel
-  Hostname merkel.debian.org
+Host hoiby.debian.org | hoiby
+  Hostname hoiby.debian.org
   User madduck
-Host murphy.debian.org | murphy
-  Hostname murphy.debian.org
+Host howells.debian.org | howells
+  Hostname howells.debian.org
+  User madduck
+Host hummel.debian.org | hummel
+  Hostname hummel.debian.org
   User madduck
-Host raptor.debian.org | raptor
-  Hostname raptor.debian.org
+Host io.debian.net | io
+  Hostname io.debian.net
   User madduck
-Host tartini.debian.org | tartini
-  Hostname tartini.debian.org
+Host ipa.debian.net | ipa
+  Hostname ipa.debian.net
   User madduck
-Host raff.debian.org | raff
-  Hostname raff.debian.org
+Host jenkins.debian.org | jenkins
+  Hostname jenkins.debian.org
+  User madduck
+Host kaufmann.debian.org | kaufmann
+  Hostname kaufmann.debian.org
   User madduck
 Host klecker.debian.org | klecker
   Hostname klecker.debian.org
   User madduck
-Host voltaire.debian.org | voltaire
-  Hostname voltaire.debian.org
+Host lebrun.debian.org | lebrun
+  Hostname lebrun.debian.org
   User madduck
-Host bruckner.debian.org | bruckner
-  Hostname bruckner.debian.org
+Host lilburn.debian.org | lilburn
+  Hostname lilburn.debian.org
   User madduck
-Host kullervo.debian.org | kullervo
-  Hostname kullervo.debian.org
+Host lobos.debian.org | lobos
+  Hostname lobos.debian.org
   User madduck
-Host samosa.debian.org | samosa
-  Hostname samosa.debian.org
+Host lotti.debian.org | lotti
+  Hostname lotti.debian.org
   User madduck
-Host caballero.debian.org | caballero
-  Hostname caballero.debian.org
+Host lucatelli.debian.org | lucatelli
+  Hostname lucatelli.debian.org
   User madduck
-Host pergolesi.debian.org | pergolesi
-  Hostname pergolesi.debian.org
+Host luchesi.debian.org | luchesi
+  Hostname luchesi.debian.org
   User madduck
-Host spontini.debian.org | spontini
-  Hostname spontini.debian.org
+Host lully.debian.org | lully
+  Hostname lully.debian.org
   User madduck
-Host mayr.debian.org | mayr
-  Hostname mayr.debian.org
+Host lw01.debian.org | lw01
+  Hostname lw01.debian.org
+  User madduck
+Host lw02.debian.org | lw02
+  Hostname lw02.debian.org
+  User madduck
+Host lw03.debian.org | lw03
+  Hostname lw03.debian.org
+  User madduck
+Host lw04.debian.org | lw04
+  Hostname lw04.debian.org
+  User madduck
+Host lw07.debian.org | lw07
+  Hostname lw07.debian.org
+  User madduck
+Host lw08.debian.org | lw08
+  Hostname lw08.debian.org
+  User madduck
+Host mailly.debian.org | mailly
+  Hostname mailly.debian.org
+  User madduck
+Host master.debian.org | master
+  Hostname master.debian.org
   User madduck
 Host mayer.debian.org | mayer
   Hostname mayer.debian.org
   User madduck
-Host agnesi.debian.org | agnesi
-  Hostname agnesi.debian.org
+Host mayr.debian.org | mayr
+  Hostname mayr.debian.org
   User madduck
-Host puccini.debian.org | puccini
-  Hostname puccini.debian.org
+Host menotti.debian.org | menotti
+  Hostname menotti.debian.org
   User madduck
-Host villa.debian.org | villa
-  Hostname villa.debian.org
+Host merulo.debian.org | merulo
+  Hostname merulo.debian.org
+  User madduck
+Host milanollo.debian.org | milanollo
+  Hostname milanollo.debian.org
+  User madduck
+Host mipsel-manda-01.debian.org | mipsel-manda-01
+  Hostname mipsel-manda-01.debian.org
+  User madduck
+Host mipsel-manda-02.debian.org | mipsel-manda-02
+  Hostname mipsel-manda-02.debian.org
+  User madduck
+Host moszumanska.debian.org | moszumanska
+  Hostname moszumanska.debian.org
+  User madduck
+Host muffat.debian.org | muffat
+  Hostname muffat.debian.org
+  User madduck
+Host mundy.debian.org | mundy
+  Hostname mundy.debian.org
+  User madduck
+Host murphy.debian.org | murphy
+  Hostname murphy.debian.org
+  User madduck
+Host nono.debian.org | nono
+  Hostname nono.debian.org
+  User madduck
+Host oyens.debian.org | oyens
+  Hostname oyens.debian.org
+  User madduck
+Host paradis.debian.org | paradis
+  Hostname paradis.debian.org
   User madduck
-Host piatti.debian.org | piatti
-  Hostname piatti.debian.org
+Host parry.debian.org | parry
+  Hostname parry.debian.org
+  User madduck
+Host partch.debian.org | partch
+  Hostname partch.debian.org
+  User madduck
+Host pasquini.debian.org | pasquini
+  Hostname pasquini.debian.org
+  User madduck
+Host pastel.debian.net | pastel
+  Hostname pastel.debian.net
+  User madduck
+Host pejacevic.debian.org | pejacevic
+  Hostname pejacevic.debian.org
   User madduck
 Host peri.debian.org | peri
   Hostname peri.debian.org
   User madduck
-Host lobos.debian.org | lobos
-  Hostname lobos.debian.org
+Host petrova.debian.org | petrova
+  Hostname petrova.debian.org
   User madduck
-Host wagner.debian.org | wagner
-  Hostname wagner.debian.org
+Host pettersson.debian.org | pettersson
+  Hostname pettersson.debian.org
   User madduck
-Host verdi.debian.org | verdi
-  Hostname verdi.debian.org
+Host philp.debian.org | philp
+  Hostname philp.debian.org
   User madduck
-Host ries.debian.org | ries
-  Hostname ries.debian.org
+Host picconi.debian.org | picconi
+  Hostname picconi.debian.org
+  User madduck
+Host piu-slave-bm-a.debian.org | piu-slave-bm-a
+  Hostname piu-slave-bm-a.debian.org
+  User madduck
+Host pkgmirror-1and1.debian.org | pkgmirror-1and1
+  Hostname pkgmirror-1and1.debian.org
+  User madduck
+Host popov.debian.org | popov
+  Hostname popov.debian.org
+  User madduck
+Host porpora.debian.org | porpora
+  Hostname porpora.debian.org
+  User madduck
+Host portman.debian.org | portman
+  Hostname portman.debian.org
+  User madduck
+Host poulenc.debian.org | poulenc
+  Hostname poulenc.debian.org
+  User madduck
+Host powell.debian.org | powell
+  Hostname powell.debian.org
+  User madduck
+Host praetorius.debian.org | praetorius
+  Hostname praetorius.debian.org
   User madduck
-Host goetz.debian.org | goetz
-  Hostname goetz.debian.org
+Host quantz.debian.org | quantz
+  Hostname quantz.debian.org
+  User madduck
+Host rainier.debian.org | rainier
+  Hostname rainier.debian.org
+  User madduck
+Host rapoport.debian.org | rapoport
+  Hostname rapoport.debian.org
+  User madduck
+Host rautavaara.debian.org | rautavaara
+  Hostname rautavaara.debian.org
   User madduck
 Host ravel.debian.org | ravel
   Hostname ravel.debian.org
   User madduck
+Host reger.debian.org | reger
+  Hostname reger.debian.org
+  User madduck
+Host rem.debian.org | rem
+  Hostname rem.debian.org
+  User madduck
+Host ries.debian.org | ries
+  Hostname ries.debian.org
+  User madduck
 Host rietz.debian.org | rietz
   Hostname rietz.debian.org
   User madduck
+Host rossini.debian.org | rossini
+  Hostname rossini.debian.org
+  User madduck
+Host saens.debian.org | saens
+  Hostname saens.debian.org
+  User madduck
+Host salieri.debian.org | salieri
+  Hostname salieri.debian.org
+  User madduck
+Host santoro.debian.org | santoro
+  Hostname santoro.debian.org
+  User madduck
+Host scelsi.debian.org | scelsi
+  Hostname scelsi.debian.org
+  User madduck
+Host schein.debian.org | schein
+  Hostname schein.debian.org
+  User madduck
+Host schroeder.debian.org | schroeder
+  Hostname schroeder.debian.org
+  User madduck
+Host schumann.debian.org | schumann
+  Hostname schumann.debian.org
+  User madduck
+Host sechter.debian.org | sechter
+  Hostname sechter.debian.org
+  User madduck
+Host senfl.debian.org | senfl
+  Hostname senfl.debian.org
+  User madduck
+Host senfter.debian.org | senfter
+  Hostname senfter.debian.org
+  User madduck
+Host sh4.g15.jp | sh4
+  Hostname sh4.g15.jp
+  User madduck
+Host sibelius.debian.org | sibelius
+  Hostname sibelius.debian.org
+  User madduck
+Host smetana.debian.org | smetana
+  Hostname smetana.debian.org
+  User madduck
+Host soler.debian.org | soler
+  Hostname soler.debian.org
+  User madduck
+Host sompek.debian.org | sompek
+  Hostname sompek.debian.org
+  User madduck
+Host sonntag.debian.org | sonntag
+  Hostname sonntag.debian.org
+  User madduck
+Host spohr.debian.org | spohr
+  Hostname spohr.debian.org
+  User madduck
+Host spontini.debian.org | spontini
+  Hostname spontini.debian.org
+  User madduck
+Host stabile.debian.org | stabile
+  Hostname stabile.debian.org
+  User madduck
+Host stadler.debian.org | stadler
+  Hostname stadler.debian.org
+  User madduck
 Host steffani.debian.org | steffani
   Hostname steffani.debian.org
   User madduck
-Host lebrun.debian.org | lebrun
-  Hostname lebrun.debian.org
+Host stockhausen.debian.org | stockhausen
+  Hostname stockhausen.debian.org
   User madduck
-Host liszt.debian.org | liszt
-  Hostname liszt.debian.org
+Host storace.debian.org | storace
+  Hostname storace.debian.org
   User madduck
-Host mundy.debian.org | mundy
-  Hostname mundy.debian.org
+Host strauss.debian.net | strauss
+  Hostname strauss.debian.net
   User madduck
-Host albeniz.debian.org | albeniz
-  Hostname albeniz.debian.org
+Host sumotsu.debian.net | sumotsu
+  Hostname sumotsu.debian.net
   User madduck
-Host sperger.debian.org | sperger
-  Hostname sperger.debian.org
+Host tchaikovsky.debian.org | tchaikovsky
+  Hostname tchaikovsky.debian.org
   User madduck
-Host kassia.debian.org | kassia
-  Hostname kassia.debian.org
+Host ticharich.debian.org | ticharich
+  Hostname ticharich.debian.org
   User madduck
-Host agricola.debian.org | agricola
-  Hostname agricola.debian.org
+Host traetta.debian.org | traetta
+  Hostname traetta.debian.org
   User madduck
-Host arcadelt.debian.org | arcadelt
-  Hostname arcadelt.debian.org
+Host tristano.debian.org | tristano
+  Hostname tristano.debian.org
   User madduck
-Host penalosa.debian.org | penalosa
-  Hostname penalosa.debian.org
+Host tye.debian.org | tye
+  Hostname tye.debian.org
   User madduck
-Host argento.debian.org | argento
-  Hostname argento.debian.org
+Host ullmann.debian.org | ullmann
+  Hostname ullmann.debian.org
   User madduck
-Host allegri.debian.org | allegri
-  Hostname allegri.debian.org
+Host unger.debian.org | unger
+  Hostname unger.debian.org
   User madduck
-Host morales.debian.org | morales
-  Hostname morales.debian.org
+Host vasks.debian.org | vasks
+  Hostname vasks.debian.org
   User madduck
-Host auber.debian.org | auber
-  Hostname auber.debian.org
+Host vento.debian.org | vento
+  Hostname vento.debian.org
   User madduck
-Host mahler.debian.org | mahler
-  Hostname mahler.debian.org
+Host villa.debian.org | villa
+  Hostname villa.debian.org
   User madduck
-Host schroeder.debian.org | schroeder
-  Hostname schroeder.debian.org
+Host vitry.debian.org | vitry
+  Hostname vitry.debian.org
   User madduck
-Host powell.debian.org | powell
-  Hostname powell.debian.org
+Host vogler.debian.org | vogler
+  Hostname vogler.debian.org
   User madduck
-Host rem.debian.org | rem
-  Hostname rem.debian.org
+Host wagner.debian.org | wagner
+  Hostname wagner.debian.org
   User madduck
-Host smetana.debian.org | smetana
-  Hostname smetana.debian.org
+Host wieck.debian.org | wieck
+  Hostname wieck.debian.org
+  User madduck
+Host wilder.debian.org | wilder
+  Hostname wilder.debian.org
+  User madduck
+Host wolkenstein.debian.org | wolkenstein
+  Hostname wolkenstein.debian.org
+  User madduck
+Host wuiet.debian.org | wuiet
+  Hostname wuiet.debian.org
+  User madduck
+Host xoothais.err.no | xoothais
+  Hostname xoothais.err.no
+  User madduck
+Host zandonai.debian.org | zandonai
+  Hostname zandonai.debian.org
+  User madduck
+Host zani.debian.org | zani
+  Hostname zani.debian.org
+  User madduck
+Host zelenka.debian.org | zelenka
+  Hostname zelenka.debian.org
+  User madduck
+Host zemlinsky.debian.org | zemlinsky
+  Hostname zemlinsky.debian.org
   User madduck
 
-Host cvs.debian.org
-  HostKeyAlias gluck.debian.org
+Host nelson.debconf.org | penta.debconf.org | nelson | summit
+  Hostname nelson.debconf.org
+  ProxyCommand ssh people.debian.org nc -q0 %h %p
+
+### PENNY
+
+Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
+  Hostname lion.mjollnir.org
+
+### TILDE CLUB
+
+Host remotes.club
+  Hostname remotes.club
+  Port 9022
   User madduck
 
-Host people.debian.org
-  HostKeyAlias ravel.debian.org
+Host tilde.camp
+  Hostname tilde.camp
   User madduck
 
-Host sergei.ifi.uzh.ch | sergei
-  Hostname sergei.ifi.uzh.ch
-  User krafft
-Host nikolai.ifi.uzh.ch | nikolai
-  Hostname nikolai.ifi.uzh.ch
-  User krafft
+Host squiggle.city
+  Hostname squiggle.city
+  User madduck
 
-Host gratis2.opro.ch | opro
-  Hostname 193.242.105.2
+Host tilde.city
+  Hostname 001.tilde.city
   User madduck
 
-Host skynet.skynet.ie | skynet.ie | skynet
-  Hostname skynet.skynet.ie
+### NZ
+
+Host workbuffer.org | nz
+  Hostname workbuffer.org
   User madduck
 
+### MISC
+
+Host github.com | github
+  Hostname github.com
+  User git
+
+### DEFAULTS
+
 Host *
 # AddressFamily any
 # BatchMode no
@@ -367,6 +902,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 30
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no
@@ -382,6 +918,7 @@ Host *
   HostKeyAlgorithms ssh-rsa
 # IdentityFile ~/.ssh/identity
   IdentityFile2 ~/.ssh/id_rsa
+  IPQoS lowdelay throughput
 # KbdInteractiveDevices pam
 # LocalCommand none
 # LocalForward none