X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/2faea1dab899aa04836fba58f63e5df83552793a..aa6dc193834938dabc9e86a359c530bf53bc8b85:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index 4755c85..eda5d9c 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -4,134 +4,207 @@ 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 matilda.madduck.net | matilda
   ForwardAgent yes
-  Port 443
-Host backup.madduck.net | backup
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
+  Hostname matilda.madduck.net
+
+Host vizier.madduck.net | vizier
+  ForwardAgent yes
+  Hostname vizier.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 sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
-  Hostname sheep.umverkehr.ch
+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 lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
-  CheckHostIP no
+Host aika.krafftwerk.de | aika
+  Hostname aika.krafftwerk.de
+
+Host sysyphus.madduck.net | sysyphus
   ForwardAgent yes
-  ForwardX11 yes
-#  AddressFamily inet
+  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 wall.oerlikon.madduck.net | wall
-  CheckHostIP no
+Host wots.madduck.net | wots
   ForwardAgent yes
-  Hostname wall.oerlikon.madduck.net
+  Hostname wots.madduck.net
+Host buildd.debian.madduck.net | buildd
+  HostKeyAlias wots.madduck.net
+
+### UNI ZURICH MACHINES
 
-Host vizier.oerlikon.madduck.net | vizier
-  Hostname vizier.oerlikon.madduck.net
+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 embryo.gauting.madduck.net | embryo
+Host shelter.madduck.net | shelter
+  ForwardAgent yes
+  Hostname shelter.madduck.net
+Host backup.madduck.net | backup
+  HostKeyAlias shelter.madduck.net
+
+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 swan.madduck.net
+
+### ARNOLD / GPLHOST
+#
+Host arnold-host | arnold-host.madduck.net
+  Hostname arnold-host.madduck.net
+  User xen05
+
+### GERN
+
+Host wall.gern.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
+  Hostname wall.gern.madduck.net
 
-Host piper.oerlikon.madduck.net | piper
-  Hostname piper.oerlikon.madduck.net
+Host julia.gern.madduck.net | julia
+  Hostname julia.gern.madduck.net
   ForwardAgent yes
-  ForwardX11 yes
-#  AddressFamily inet
-Host pipere
-  Hostname wall.madduck.net
-  Port 22223
+Host juliae
+  Hostname wall.gern.madduck.net
+  Port 22002
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias piper.oerlikon.madduck.net
+  HostKeyAlias julia.gern.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.oerlikon.madduck.net
+Host albatross.lehel.madduck.net | albatross
+  Hostname albatross.lehel.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
-Host diamonde
-  Hostname wall.madduck.net
-  Port 22224
+Host albatrosse
+  Hostname wall.gern.madduck.net
+  Port 22032
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias diamond.oerlikon.madduck.net
+  HostKeyAlias albatross.lehel.madduck.net
+
+Host galaxy-s2.phones.gern | galaxy-s2
+  Hostname galaxy-s2.phones.gern
+  HostKeyAlias galaxy-s2.phones.gern
+  User root
 
-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 auge-fr.no-ip.org | auge
+Host visitor*.gern.madduck.net | visitor*.gern | visitor*
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### LEHEL
+
+Host clegg.lehel.madduck.net | clegg
   CheckHostIP no
-  Hostname auge-fr.no-ip.org
-  HostKeyAlias helena.home.mjollnir.org
+  ForwardAgent yes
+  Hostname clegg.lehel.madduck.net
 
-Host hermia.home.mjollnir.org | hermia | lust.oerlikon.madduck.net | lust
+### GAUTING
+
+Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
-  ForwardX11 yes
-  HostKeyAlias hermia.home.mjollnir.org
+  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
@@ -142,236 +215,181 @@ 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
+### ROAD WARRIORS
+
+Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
   CheckHostIP no
-  Hostname zlinli.no-ip.org
+  ForwardAgent yes
+  ForwardX11 yes
 
-Host debian-community.org | bikeshed.debian-community.org | bikeshed
-  Hostname bikeshed.debian-community.org
-  User madduck
-  ForwardAgent no
-  ForwardX11 no
+Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
 
-Host alioth.debian.org | alioth
-  Hostname alioth.debian.org
+### DEBIAN
+
+Host scm.alioth.debian.org
+  HostKeyAlias wagner.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
-  User madduck
-
-Host malo.debian.org | malo
-  Hostname malo.debian.org
-  User madduck
-Host paer.debian.org | paer
-  Hostname paer.debian.org
-  User madduck
-Host crest.debian.org | crest
-  Hostname crest.debian.org
-  User madduck
-Host saens.debian.org | saens
-  Hostname saens.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
-Host spohr.debian.org | spohr
-  Hostname spohr.debian.org
+Host cvs.debian.org
+  HostKeyAlias vasks.debian.org
   User madduck
-Host gluck.debian.org | gluck
-  Hostname gluck.debian.org
+
+Host people.debian.org
+  HostKeyAlias ravel.debian.org
   User madduck
-Host elara.debian.org | elara
-  Hostname elara.debian.org
+
+Host abel.debian.org | abel
+  Hostname abel.debian.org
   User madduck
-Host sarti.debian.org | sarti
-  Hostname sarti.debian.org
+Host agricola.debian.org | agricola
+  Hostname agricola.debian.org
   User madduck
-Host europa.debian.org | europa
-  Hostname europa.debian.org
+Host albeniz.debian.org | albeniz
+  Hostname albeniz.debian.org
   User madduck
-Host master.debian.org | master
-  Hostname master.debian.org
+Host asdfasdf.debian.net | asdfasdf
+  Hostname asdfasdf.debian.net
   User madduck
-Host bartok.debian.org | bartok
-  Hostname bartok.debian.org
+Host busoni.debian.org | busoni
+  Hostname busoni.debian.org
   User madduck
-Host merulo.debian.org | merulo
-  Hostname merulo.debian.org
+Host cilea.debian.org | cilea
+  Hostname cilea.debian.org
   User madduck
-Host merkel.debian.org | merkel
-  Hostname merkel.debian.org
+Host duarte.debian.org | duarte
+  Hostname duarte.debian.org
   User madduck
-Host murphy.debian.org | murphy
-  Hostname murphy.debian.org
+Host dukas.debian.org | dukas
+  Hostname dukas.debian.org
   User madduck
-Host raptor.debian.org | raptor
-  Hostname raptor.debian.org
+Host glinka.debian.org | glinka
+  Hostname glinka.debian.org
   User madduck
-Host tartini.debian.org | tartini
-  Hostname tartini.debian.org
+Host grieg.debian.org | grieg
+  Hostname grieg.debian.org
   User madduck
-Host raff.debian.org | raff
-  Hostname raff.debian.org
+Host io.debian.net | io
+  Hostname io.debian.net
   User madduck
-Host klecker.debian.org | klecker
-  Hostname klecker.debian.org
+Host lindberg.debian.org | lindberg
+  Hostname lindberg.debian.org
   User madduck
-Host voltaire.debian.org | voltaire
-  Hostname voltaire.debian.org
+Host master.debian.org | master
+  Hostname master.debian.org
   User madduck
-Host bruckner.debian.org | bruckner
-  Hostname bruckner.debian.org
+Host merulo.debian.org | merulo
+  Hostname merulo.debian.org
   User madduck
-Host kullervo.debian.org | kullervo
-  Hostname kullervo.debian.org
+Host nono.debian.org | nono
+  Hostname nono.debian.org
   User madduck
-Host samosa.debian.org | samosa
-  Hostname samosa.debian.org
+Host paer.debian.org | paer
+  Hostname paer.debian.org
   User madduck
-Host caballero.debian.org | caballero
-  Hostname caballero.debian.org
+Host paganini.debian.org | paganini
+  Hostname paganini.debian.org
   User madduck
 Host pergolesi.debian.org | pergolesi
   Hostname pergolesi.debian.org
   User madduck
-Host spontini.debian.org | spontini
-  Hostname spontini.debian.org
-  User madduck
-Host mayr.debian.org | mayr
-  Hostname mayr.debian.org
-  User madduck
-Host mayer.debian.org | mayer
-  Hostname mayer.debian.org
-  User madduck
-Host agnesi.debian.org | agnesi
-  Hostname agnesi.debian.org
-  User madduck
-Host puccini.debian.org | puccini
-  Hostname puccini.debian.org
-  User madduck
-Host villa.debian.org | villa
-  Hostname villa.debian.org
+Host pescetti.debian.org | pescetti
+  Hostname pescetti.debian.org
   User madduck
 Host piatti.debian.org | piatti
   Hostname piatti.debian.org
   User madduck
-Host peri.debian.org | peri
-  Hostname peri.debian.org
+Host powell.debian.org | powell
+  Hostname powell.debian.org
   User madduck
-Host lobos.debian.org | lobos
-  Hostname lobos.debian.org
+Host quantz.debian.org | quantz
+  Hostname quantz.debian.org
   User madduck
-Host wagner.debian.org | wagner
-  Hostname wagner.debian.org
+Host ravel.debian.org | ravel
+  Hostname ravel.debian.org
   User madduck
-Host verdi.debian.org | verdi
-  Hostname verdi.debian.org
+Host respighi.debian.org | respighi
+  Hostname respighi.debian.org
   User madduck
 Host ries.debian.org | ries
   Hostname ries.debian.org
   User madduck
-Host goetz.debian.org | goetz
-  Hostname goetz.debian.org
+Host rore.debian.org | rore
+  Hostname rore.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
-Host steffani.debian.org | steffani
-  Hostname steffani.debian.org
-  User madduck
-Host lebrun.debian.org | lebrun
-  Hostname lebrun.debian.org
+Host samosa.debian.org | samosa
+  Hostname samosa.debian.org
   User madduck
-Host liszt.debian.org | liszt
-  Hostname liszt.debian.org
+Host senfl.debian.org | senfl
+  Hostname senfl.debian.org
   User madduck
-Host mundy.debian.org | mundy
-  Hostname mundy.debian.org
+Host sh4.g15.jp | sh4
+  Hostname sh4.g15.jp
   User madduck
-Host albeniz.debian.org | albeniz
-  Hostname albeniz.debian.org
+Host smetana.debian.org | smetana
+  Hostname smetana.debian.org
   User madduck
 Host sperger.debian.org | sperger
   Hostname sperger.debian.org
   User madduck
-Host kassia.debian.org | kassia
-  Hostname kassia.debian.org
-  User madduck
-Host agricola.debian.org | agricola
-  Hostname agricola.debian.org
-  User madduck
-Host arcadelt.debian.org | arcadelt
-  Hostname arcadelt.debian.org
+Host stabile.debian.org | stabile
+  Hostname stabile.debian.org
   User madduck
-Host penalosa.debian.org | penalosa
-  Hostname penalosa.debian.org
-  User madduck
-Host argento.debian.org | argento
-  Hostname argento.debian.org
-  User madduck
-Host allegri.debian.org | allegri
-  Hostname allegri.debian.org
-  User madduck
-Host morales.debian.org | morales
-  Hostname morales.debian.org
+Host strauss.debian.net | strauss
+  Hostname strauss.debian.net
   User madduck
-Host auber.debian.org | auber
-  Hostname auber.debian.org
+Host sumotsu.debian.net | sumotsu
+  Hostname sumotsu.debian.net
   User madduck
-Host mahler.debian.org | mahler
-  Hostname mahler.debian.org
+Host tye.debian.org | tye
+  Hostname tye.debian.org
   User madduck
-Host schroeder.debian.org | schroeder
-  Hostname schroeder.debian.org
+Host vasks.debian.org | vasks
+  Hostname vasks.debian.org
   User madduck
-Host powell.debian.org | powell
-  Hostname powell.debian.org
+Host vivaldi.debian.org | vivaldi
+  Hostname vivaldi.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 widor.debian.org | widor
+  Hostname widor.debian.org
   User madduck
-Host strauss.debian.net | strauss
-  Hostname strauss.debian.net
+Host zelenka.debian.org | zelenka
+  Hostname zelenka.debian.org
   User madduck
 
-Host cvs.debian.org
-  HostKeyAlias gluck.debian.org
-  User madduck
+### NZ
 
-Host people.debian.org
-  HostKeyAlias ravel.debian.org
+Host workbuffer.org | nz
+  Hostname workbuffer.org
   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
+### MISC
 
-Host gratis2.opro.ch | opro
-  Hostname 193.242.105.2
-  User madduck
+Host github.com | github
+  Hostname github.com
+  User git
 
-Host skynet.skynet.ie | skynet.ie | skynet
-  Hostname skynet.skynet.ie
-  User madduck
+### DEFAULTS
 
 Host *
 # AddressFamily any
@@ -386,6 +404,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no
@@ -401,6 +420,7 @@ Host *
   HostKeyAlgorithms ssh-rsa
 # IdentityFile ~/.ssh/identity
   IdentityFile2 ~/.ssh/id_rsa
+  IPQoS lowdelay throughput
 # KbdInteractiveDevices pam
 # LocalCommand none
 # LocalForward none