X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/72c5f0a829dd902d9b3522b49f39dc5a20c0823d..325d30d8b71c9647abaab3ab661e5ff0d9624175:/.ssh/config.in?pf=etc

diff --git a/.ssh/config.in b/.ssh/config.in
index 2b7192f..b9f4134 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -14,12 +14,29 @@ Host charade-vnc
   ControlPath none
   Hostname charade.madduck.net
 
+Host emily.madduck.net | emily
+  ForwardAgent yes
+  Hostname emily.madduck.net
+
 Host matilda.madduck.net | matilda
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
+  ForwardAgent yes
   Hostname matilda.madduck.net
-  ControlMaster no
-  ControlPath none
+
+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
+
+Host alan.madduck.net | alan
+  ForwardAgent yes
+  Hostname alan.madduck.net
 
 ### KHYBER KVM HOST
 
@@ -57,20 +74,12 @@ Host jugband.madduck.net | jugband
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
-Host irc
-  User madduck
-  Hostname domine.madduck.net
-  ConnectTimeout 60
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
 Host aika.krafftwerk.de | aika
   Hostname aika.krafftwerk.de
 
-Host vizier.madduck.net | vizier
-  ForwardAgent yes
-  Hostname vizier.madduck.net
-
 Host sysyphus.madduck.net | sysyphus
   ForwardAgent yes
   Hostname sysyphus.madduck.net
@@ -81,12 +90,6 @@ Host ssh443.madduck.net | ssh443
 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 diamond.madduck.net | diamond
@@ -126,21 +129,22 @@ Host franz.ifi.uzh.ch | franz
   Hostname franz.ifi.uzh.ch
   User krafft
 
-### SWAN / BYTEMARK
+### PIPER / BYTEMARK
 
-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 piper.madduck.net | piper
+  Hostname piper.madduck.net
 
 ### ARNOLD / GPLHOST
-#
+
+Host arnold.madduck.net | arnold
+  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
 
@@ -152,30 +156,17 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
-Host juliae
-  Hostname wall.gern.madduck.net
-  Port 22002
-  CheckHostIP no
-  ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias julia.gern.madduck.net
 
-Host albatross.lehel.madduck.net | albatross
-  Hostname albatross.lehel.madduck.net
+Host git.gern.madduck.net | git.gern
   ForwardAgent yes
-  ForwardX11 yes
-Host albatrosse
-  Hostname wall.gern.madduck.net
-  Port 22032
-  CheckHostIP no
+  HostKeyAlias julia.gern.madduck.net
+Host annex.gern.madduck.net | annex.gern
   ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.lehel.madduck.net
-
-Host galaxy-s2.phones.gern | galaxy-s2
-  Hostname galaxy-s2.phones.gern
-  HostKeyAlias galaxy-s2.phones.gern
-  User root
+  HostKeyAlias julia.gern.madduck.net
+Host shared.gern.madduck.net | shared.gern
+  ForwardAgent yes
+  HostKeyAlias julia.gern.madduck.net
 
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
@@ -188,11 +179,17 @@ Host visitor*.gern.madduck.net | visitor*.gern | visitor*
 
 ### LEHEL
 
-Host clegg.lehel.madduck.net | clegg
+Host clegg.lehel.madduck.net | clegg.lehel | clegg
   CheckHostIP no
   ForwardAgent yes
   Hostname clegg.lehel.madduck.net
 
+Host albatross.lehel.madduck.net | albatross.lehel | albatross
+  Hostname albatross.lehel.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias albatross.lehel
+
 ### GAUTING
 
 Host embryo.gauting.madduck.net | embryo
@@ -207,7 +204,7 @@ Host mother.gauting | mother | mother.gauting.madduck.net
   ForwardX11 yes
 Host mothere
   Hostname embryo.gauting.madduck.net
-  Port 22221
+  Port 22021
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -225,157 +222,671 @@ Host bricke
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
+### MOUNT VICTORIA
+
+Host atom.mtvic.madduck.net | atom.mtvic | atom
+  Hostname atom.mtvic.madduck.net
+  ForwardAgent yes
+
 ### ROAD WARRIORS
 
-Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
+Host fishbowl.*
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
+  HostKeyAlias fishbowl
 
-Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
+Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
+  HostKeyAlias fishbowl
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,rw}.madduck.net; eval fping -aAC1 -t100 $TRIES; eval fping6 -aAC1 -t100 $TRIES; wait) 2>&1 | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; nc -vq0 \${TARGETS%%%%,*} %p"
+
+### LOCAL VIRT HOSTS
+
+Host *.virt | 192.168.122.* | red | green | blue | yellow | black | white | orange | violet
+  CheckHostIP no
+  ForwardAgent yes
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  ControlMaster no
+  User root
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
 
 ### DEBIAN
 
+Host scm.alioth.debian.org
+  HostKeyAlias moszumanska.debian.org
+  User madduck
 Host svn.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host git.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host hg.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 Host cvs.debian.org
-  HostKeyAlias vasks.debian.org
+  HostKeyAlias moszumanska.debian.org
   User madduck
 
-Host people.debian.org
-  HostKeyAlias ravel.debian.org
+Host people.debian.org | people
+  Hostname people.debian.org
+  HostKeyAlias paradis.debian.org
   User madduck
 
 Host abel.debian.org | abel
   Hostname abel.debian.org
   User madduck
-Host agricola.debian.org | agricola
-  Hostname agricola.debian.org
+Host adayevskaya.debian.org | adayevskaya
+  Hostname adayevskaya.debian.org
+  User madduck
+Host alkman.debian.org | alkman
+  Hostname alkman.debian.org
+  User madduck
+Host alwyn.debian.org | alwyn
+  Hostname alwyn.debian.org
   User madduck
-Host albeniz.debian.org | albeniz
-  Hostname albeniz.debian.org
+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 cilea.debian.org | cilea
-  Hostname cilea.debian.org
+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 duarte.debian.org | duarte
-  Hostname duarte.debian.org
+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 grieg.debian.org | grieg
-  Hostname grieg.debian.org
+Host gluck.debian.org | gluck
+  Hostname gluck.debian.org
+  User madduck
+Host gombert.debian.org | gombert
+  Hostname gombert.debian.org
+  User madduck
+Host handel.debian.org | handel
+  Hostname handel.debian.org
+  User madduck
+Host harris.debian.org | harris
+  Hostname harris.debian.org
+  User madduck
+Host hartmann.debian.org | hartmann
+  Hostname hartmann.debian.org
+  User madduck
+Host hasse.debian.org | hasse
+  Hostname hasse.debian.org
+  User madduck
+Host henze.debian.org | henze
+  Hostname henze.debian.org
+  User madduck
+Host hoiby.debian.org | hoiby
+  Hostname hoiby.debian.org
+  User madduck
+Host howells.debian.org | howells
+  Hostname howells.debian.org
+  User madduck
+Host hummel.debian.org | hummel
+  Hostname hummel.debian.org
   User madduck
 Host io.debian.net | io
   Hostname io.debian.net
   User madduck
-Host lindberg.debian.org | lindberg
-  Hostname lindberg.debian.org
+Host ipa.debian.net | ipa
+  Hostname ipa.debian.net
+  User madduck
+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 lebrun.debian.org | lebrun
+  Hostname lebrun.debian.org
+  User madduck
+Host lilburn.debian.org | lilburn
+  Hostname lilburn.debian.org
+  User madduck
+Host lobos.debian.org | lobos
+  Hostname lobos.debian.org
+  User madduck
+Host lotti.debian.org | lotti
+  Hostname lotti.debian.org
+  User madduck
+Host lucatelli.debian.org | lucatelli
+  Hostname lucatelli.debian.org
+  User madduck
+Host luchesi.debian.org | luchesi
+  Hostname luchesi.debian.org
+  User madduck
+Host lully.debian.org | lully
+  Hostname lully.debian.org
+  User madduck
+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 mayr.debian.org | mayr
+  Hostname mayr.debian.org
+  User madduck
+Host menotti.debian.org | menotti
+  Hostname menotti.debian.org
+  User madduck
 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 paer.debian.org | paer
-  Hostname paer.debian.org
+Host oyens.debian.org | oyens
+  Hostname oyens.debian.org
+  User madduck
+Host paradis.debian.org | paradis
+  Hostname paradis.debian.org
+  User madduck
+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 paganini.debian.org | paganini
-  Hostname paganini.debian.org
+Host petrova.debian.org | petrova
+  Hostname petrova.debian.org
   User madduck
-Host pergolesi.debian.org | pergolesi
-  Hostname pergolesi.debian.org
+Host pettersson.debian.org | pettersson
+  Hostname pettersson.debian.org
   User madduck
-Host pescetti.debian.org | pescetti
-  Hostname pescetti.debian.org
+Host philp.debian.org | philp
+  Hostname philp.debian.org
   User madduck
-Host piatti.debian.org | piatti
-  Hostname piatti.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 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 respighi.debian.org | respighi
-  Hostname respighi.debian.org
+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 rore.debian.org | rore
-  Hostname rore.debian.org
+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 samosa.debian.org | samosa
-  Hostname samosa.debian.org
+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 sperger.debian.org | sperger
-  Hostname sperger.debian.org
+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 stockhausen.debian.org | stockhausen
+  Hostname stockhausen.debian.org
+  User madduck
+Host storace.debian.org | storace
+  Hostname storace.debian.org
+  User madduck
 Host strauss.debian.net | strauss
   Hostname strauss.debian.net
   User madduck
 Host sumotsu.debian.net | sumotsu
   Hostname sumotsu.debian.net
   User madduck
+Host tchaikovsky.debian.org | tchaikovsky
+  Hostname tchaikovsky.debian.org
+  User madduck
+Host ticharich.debian.org | ticharich
+  Hostname ticharich.debian.org
+  User madduck
+Host traetta.debian.org | traetta
+  Hostname traetta.debian.org
+  User madduck
+Host tristano.debian.org | tristano
+  Hostname tristano.debian.org
+  User madduck
 Host tye.debian.org | tye
   Hostname tye.debian.org
   User madduck
+Host ullmann.debian.org | ullmann
+  Hostname ullmann.debian.org
+  User madduck
+Host unger.debian.org | unger
+  Hostname unger.debian.org
+  User madduck
 Host vasks.debian.org | vasks
   Hostname vasks.debian.org
   User madduck
-Host vivaldi.debian.org | vivaldi
-  Hostname vivaldi.debian.org
+Host vento.debian.org | vento
+  Hostname vento.debian.org
+  User madduck
+Host villa.debian.org | villa
+  Hostname villa.debian.org
+  User madduck
+Host vitry.debian.org | vitry
+  Hostname vitry.debian.org
+  User madduck
+Host vogler.debian.org | vogler
+  Hostname vogler.debian.org
   User madduck
 Host wagner.debian.org | wagner
   Hostname wagner.debian.org
   User madduck
-Host widor.debian.org | widor
-  Hostname widor.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 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 tilde.camp
+  Hostname tilde.camp
+  User madduck
+
+Host squiggle.city
+  Hostname squiggle.city
+  User madduck
+
+Host tilde.city
+  Hostname 001.tilde.city
+  User madduck
 
 ### NZ
 
@@ -404,7 +915,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
-  ControlPersist 5
+  ControlPersist 30
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no