X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/f2951c8fa0754ef1b73c24f5e77a5d223e9f25b3..046eb32b50b59409a31e03152bdd195f331076ce:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index e417ef4..52725f1 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -1,100 +1,85 @@
 Host 127.0.0.1 | localhost
-  ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
-Host pulse.madduck.net | pulse
-  ForwardAgent yes
-  Hostname pulse.madduck.net
-  #AddressFamily inet
-Host svn.madduck.net | svn
-  User madduck
-  HostKeyAlias pulse.madduck.net
-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 backup.madduck.net | backup
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
+### CHARADE KVM HOST
 
-Host khyber.madduck.net | khyber
-  ForwardAgent yes
-  Hostname khyber.madduck.net
-Host khyber-vnc
+Host charade.madduck.net | charade
+  Hostname charade.madduck.net
+Host charade-vnc
   ControlMaster no
   ControlPath none
-  Hostname khyber.madduck.net
+  Hostname charade.madduck.net
 
-Host wots.madduck.net | wots
-  ForwardAgent yes
-  Hostname wots.madduck.net
-Host buildd.debian.madduck.net | buildd
-  HostKeyAlias wots.madduck.net
+Host emily.madduck.net | emily
+  Hostname emily.madduck.net
 
-Host lotus.madduck.net | lotus
-  ForwardAgent yes
-  Hostname lotus.madduck.net
-Host git.madduck.net | git
+Host matilda.madduck.net | matilda
+  Hostname matilda.madduck.net
+Host irc-host.madduck.net | irc-host
+  User madduck
+  HostKeyAlias matilda.madduck.net
+  Hostname matilda.madduck.net
+  ConnectTimeout 60
+Host ssh443
+  User madduck
+  HostKeyAlias matilda.madduck.net
+  Hostname matilda.madduck.net
+  Port 443
+  ConnectTimeout 60
+  DynamicForward 9001
+
+Host vizier.madduck.net | vizier
+  Hostname vizier.madduck.net
+Host admin.madduck.net | admin
+  Hostname admin.madduck.net
+  HostKeyAlias vizier.madduck.net
   User git
-  HostKeyAlias lotus.madduck.net
-Host git.debian.ch
+
+Host ambassador.madduck.net | ambassador
+  Hostname ambassador.madduck.net
+
+Host alan.madduck.net | alan
+  Hostname alan.madduck.net
+Host git.madduck.net | git
   User git
-  HostKeyAlias lotus.madduck.net
+  HostKeyAlias alan.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 swan.madduck.net | swan
+  Hostname swan.madduck.net
 
-Host jugband.madduck.net | jugband
-  ForwardAgent yes
-  Hostname jugband.madduck.net
+Host pulse.madduck.net | pulse
+  Hostname pulse.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 seamus.madduck.net | seamus
+  Hostname seamus.madduck.net
 
-Host swan.madduck.net | swan
-  ForwardAgent yes
-  Hostname swan.madduck.net
+Host cymbaline.madduck.net | cymbaline
+  Hostname cymbaline.madduck.net
 
-Host domine.madduck.net | domine
-  ForwardAgent yes
-  Hostname domine.madduck.net
+Host lunatic.madduck.net | lunatic
+  Hostname lunatic.madduck.net
 
-Host irc
-  Hostname domine.madduck.net
-  ConnectTimeout 60
+### UNI ZURICH MACHINES
 
-Host martin-krafft.net
-  User madduck
-  HostKeyAlias seamus.madduck.net
-Host phd.martin-krafft.net
-  User madduck
-  HostKeyAlias seamus.madduck.net
-Host madduck.net
-  User madduck
-  HostKeyAlias seamus.madduck.net
-Host imap.madduck.net
-  HostKeyAlias domine.madduck.net
+Host gig.madduck.net | gig
+  Hostname gig.madduck.net
+
+Host eugene.madduck.net | eugene
+  Hostname eugene.madduck.net
+Host eugene-luks
+  Hostname eugene.madduck.net
+  User root
 
 Host diamond.madduck.net | diamond
-  ForwardAgent yes
   Hostname diamond.madduck.net
+  LocalForward localhost:8389 localhost:8384
+Host debian.madduck.net | debian
+  HostKeyAlias diamond.madduck.net
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias diamond.madduck.net
@@ -111,341 +96,257 @@ Host flics.madduck.net | flics
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+
 Host shelter.madduck.net | shelter
-  ForwardAgent yes
   Hostname shelter.madduck.net
+Host backup.madduck.net | backup
+  HostKeyAlias shelter.madduck.net
 
-Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
-  Hostname sheep.umverkehr.ch
-  User madduck
+### PIPER / BYTEMARK
 
-Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
+Host piper.madduck.net | piper
+  Hostname piper.madduck.net
 
-Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
+### CIRRUS / HETZNER
 
-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 juliae
-  Hostname wall.gern.madduck.net
-  Port 22002
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias julia.gern.madduck.net
+Host cirrus.madduck.net | cirrus
+  Hostname cirrus.madduck.net
 
-Host galaxy-s2.phones.gern | galaxy-s2
-  Hostname galaxy-s2.phones.gern
-  User root
+### LEHEL
 
-Host embryo.gauting.madduck.net | embryo
+Host clegg.lehel.madduck.net | clegg.lehel | clegg
   CheckHostIP no
-  ForwardAgent yes
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
-
-Host piper.gern.madduck.net | piper
-  Hostname piper.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
+  Hostname clegg.lehel.madduck.net
+
+Host albatross.lehel.madduck.net | albatross.lehel | albatross
+  Hostname albatross.lehel.madduck.net
+  HostKeyAlias albatross.lehel
+  LocalForward localhost:8387 localhost:8384
+Host albatross-luks
+  Hostname albatross.lehel.madduck.net
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  User root
 
-Host albatross.gern.madduck.net | albatross
-  Hostname albatross.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-Host albatrosse
-  Hostname wall.gern.madduck.net
-  Port 22032
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.gern.madduck.net
+Host albatross-via-clegg | ralbatross
+  Hostname albatross.lehel.madduck.net
+  ProxyJump clegg.dyndns.madduck.net
+  AddressFamily inet
+  LocalForward localhost:8387 localhost:8384
 
-Host pict.gern.madduck.net | pict
-  Hostname pict.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-#  AddressFamily inet
+Host bike.lehel.madduck.net | bike.lehel | bike
+  Hostname bike.lehel.madduck.net
+  HostKeyAlias bike.lehel
 
-Host visitor*.gern.madduck.net | visitor*.gern | visitor*
+Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-Host auge-fr.no-ip.org | auge
-  CheckHostIP no
-  Hostname auge-fr.no-ip.org
-  HostKeyAlias helena.home.mjollnir.org
+### GAUTING
 
 Host mother.gauting | mother | mother.gauting.madduck.net
-  Hostname mother.gauting
-  ForwardAgent yes
-  ForwardX11 yes
+  Hostname mother.fritz.box
+  HostKeyAlias mother.gauting.madduck.net
+
 Host mothere
-  Hostname embryo.gauting.madduck.net
-  Port 22221
+  Hostname mother.dyndns.madduck.net
+  Port 22021
   CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
-Host brick.gauting.madduck.net | brick
-  Hostname brick.gauting.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-Host bricke
-  Hostname embryo.gauting.madduck.net
-  Port 22222
+### MTVIC
+
+Host wall.mtvic.madduck.net | wall.mtvic | wall
+  Hostname wall.mtvic.madduck.net
+
+Host wall-ipv4
+  Hostname wall.mtvic.madduck.net
+  AddressFamily inet
+
+Host bell.mtvic.madduck.net | bell.mtvic | bell
+  Hostname bell.mtvic.madduck.net
+
+Host julia.mtvic.madduck.net | julia.mtvic | julia
+  Hostname julia.mtvic.madduck.net
+  LocalForward localhost:8388 localhost:8384
+
+Host julia-via-wall | rjulia
+  Hostname julia.mtvic.madduck.net
+  ProxyJump wall-ipv4
+  LocalForward localhost:8388 localhost:8384
+
+Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
+  Hostname jugband.mtvic.madduck.net
+
+Host wing.mtvic.madduck.net | wing.mtvic | wing
+  Hostname wing.mtvic.madduck.net
+
+Host echo.mtvic.madduck.net | echo.mtvic | echo
+  Hostname echo.mtvic.madduck.net
+
+Host visitor*.mtvic.madduck.net | visitor*.mtvic
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### CATALYST
+
+Host atom.catalyst.madduck.net | atom.catalyst | atom
+  Hostname atom.catalyst.madduck.net
+
+### ROAD WARRIORS
+
+Host fishbowl.*
   CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias brick.gauting.madduck.net
+  HostKeyAlias fishbowl
+  LocalForward localhost:8386 localhost:8384
 
-Host zlinli.no-ip.org | zlinli
+Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
-  Hostname zlinli.no-ip.org
+  HostKeyAlias fishbowl
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
+  LocalForward localhost:8386 localhost:8384
 
-Host debian-community.org | bikeshed.debian-community.org | bikeshed
-  Hostname bikeshed.debian-community.org
-  User madduck
-  ForwardAgent no
-  ForwardX11 no
+Host lotus.*
+  CheckHostIP no
+  HostKeyAlias lotus
+  LocalForward localhost:8385 localhost:8384
 
-Host alioth.debian.org | alioth
-  hostKeyAlias wagner.debian.org
-  User madduck
+Host lotus | lotus.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias lotus
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
+  LocalForward localhost:8385 localhost:8384
 
-Host svn.debian.org
-  HostKeyAlias vasks.debian.org
-  User madduck
-Host git.debian.org
-  HostKeyAlias vasks.debian.org
-  User madduck
-Host hg.debian.org
-  HostKeyAlias vasks.debian.org
-  User madduck
-Host cvs.debian.org
-  HostKeyAlias vasks.debian.org
-  User madduck
+Host ini | ini.dyndns.madduck.net
+  CheckHostIP no
+  HostKeyAlias ini.dyndns.madduck.net
+  HostName ini.dyndns.madduck.net
+  Port 13579
+  User christine
+
+### PHONES
+
+Host sgs7e | sgs7e.phones.*
+  Port 2222
+  User shell
+  HostName sgs7e.phones
+  HostKeyAlias sgs7e.phones
+  LocalForward localhost:8390 localhost:8384
+
+Host tethered-sgs7e
+  Port 2222
+  User shell
+  HostName 192.168.43.1
+  HostKeyAlias sgs7e.phones
+  LocalForward localhost:8390 localhost:8384
+
+Host sgs5m | sgs5m.phones.*
+  User shell
+  HostName sgs5m.phones
+  HostKeyAlias sgs5m.phones
+  LocalForward localhost:8391 localhost:8384
+
+### LOCAL VIRT HOSTS
+
+Host red | green | blue | yellow | black | white | orange | violet | wafer
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
+  VerifyHostKeyDNS no
+  CheckHostIP no
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### DEBIAN
+
+Host alioth.debian.org | anonscm.alioth.debian.org | svn.debian.org | git.debian.org | hg.debian.org | cvs.debian.org
+  HostKeyAlias moszumanska.debian.org
+
+Host people.debian.org | people
+  Hostname people.debian.org
+  HostKeyAlias paradis.debian.org
 
-Host abel.debian.org | abel
-  Hostname abel.debian.org
-  User madduck
-Host agricola.debian.org | agricola
-  Hostname agricola.debian.org
-  User madduck
-Host albeniz.debian.org | albeniz
-  Hostname albeniz.debian.org
-  User madduck
-Host asdfasdf.debian.net | asdfasdf
-  Hostname asdfasdf.debian.net
-  User madduck
-Host busoni.debian.org | busoni
-  Hostname busoni.debian.org
-  User madduck
-Host cilea.debian.org | cilea
-  Hostname cilea.debian.org
-  User madduck
-Host duarte.debian.org | duarte
-  Hostname duarte.debian.org
-  User madduck
-Host dukas.debian.org | dukas
-  Hostname dukas.debian.org
-  User madduck
-Host glinka.debian.org | glinka
-  Hostname glinka.debian.org
-  User madduck
-Host grieg.debian.org | grieg
-  Hostname grieg.debian.org
-  User madduck
-Host io.debian.net | io
-  Hostname io.debian.net
-  User madduck
-Host lindberg.debian.org | lindberg
-  Hostname lindberg.debian.org
-  User madduck
 Host master.debian.org | master
   Hostname master.debian.org
+
+Match host *.debian.org
+  StrictHostKeyChecking ask
+  VerifyHostKeyDNS ask
   User madduck
-Host merulo.debian.org | merulo
-  Hostname merulo.debian.org
-  User madduck
-Host nono.debian.org | nono
-  Hostname nono.debian.org
-  User madduck
-Host paer.debian.org | paer
-  Hostname paer.debian.org
-  User madduck
-Host paganini.debian.org | paganini
-  Hostname paganini.debian.org
-  User madduck
-Host pergolesi.debian.org | pergolesi
-  Hostname pergolesi.debian.org
-  User madduck
-Host pescetti.debian.org | pescetti
-  Hostname pescetti.debian.org
-  User madduck
-Host piatti.debian.org | piatti
-  Hostname piatti.debian.org
-  User madduck
-Host powell.debian.org | powell
-  Hostname powell.debian.org
-  User madduck
-Host quantz.debian.org | quantz
-  Hostname quantz.debian.org
-  User madduck
-Host ravel.debian.org | ravel
-  Hostname ravel.debian.org
-  User madduck
-Host respighi.debian.org | respighi
-  Hostname respighi.debian.org
-  User madduck
-Host ries.debian.org | ries
-  Hostname ries.debian.org
-  User madduck
-Host rore.debian.org | rore
-  Hostname rore.debian.org
-  User madduck
-Host samosa.debian.org | samosa
-  Hostname samosa.debian.org
-  User madduck
-Host senfl.debian.org | senfl
-  Hostname senfl.debian.org
-  User madduck
-Host sh4.g15.jp | sh4
-  Hostname sh4.g15.jp
-  User madduck
-Host smetana.debian.org | smetana
-  Hostname smetana.debian.org
-  User madduck
-Host sperger.debian.org | sperger
-  Hostname sperger.debian.org
-  User madduck
-Host stabile.debian.org | stabile
-  Hostname stabile.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 tye.debian.org | tye
-  Hostname tye.debian.org
-  User madduck
-Host vasks.debian.org | vasks
-  Hostname vasks.debian.org
-  User madduck
-Host vivaldi.debian.org | vivaldi
-  Hostname vivaldi.debian.org
-  User madduck
-Host wagner.debian.org | wagner
-  Hostname wagner.debian.org
-  User madduck
-Host widor.debian.org | widor
-  Hostname widor.debian.org
-  User madduck
-Host zelenka.debian.org | zelenka
-  Hostname zelenka.debian.org
-  User madduck
 
-Host people.debian.org
-  HostKeyAlias ravel.debian.org
+### DEBCONF
+
+Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
+  Hostname nelson.debconf.org
+  ProxyJump sysyphus.madduck.net
+
+Host itchy.debconf.org | itchy | wafer.debconf.org | wafer
+  Hostname itchy.debconf.org
+  ProxyJump sysyphus.madduck.net
+
+Host kent.debconf.org | kent
+  Hostname kent.debconf.org
+  ProxyJump sysyphus.madduck.net
+
+### TILDE CLUB
+
+Host squiggle.city
+  Hostname squiggle.city
   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 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
+### NZ
+
+Host workbuffer.org | nz
+  Hostname workbuffer.org
   User madduck
 
-Host arnold-host | arnold-host.madduck.net
-  Hostname arnold-host.madduck.net
-  User xen05
+### MISC
+
+Host github.com | github
+  Hostname github.com
+  User git
+
+Host gitlab.com | gitlab
+  Hostname gitlab.com
+  User git
 
-Host skynet.skynet.ie | skynet.ie | skynet
-  Hostname skynet.skynet.ie
+Host gitlab.debian.net | git.fosscommunity.in
+  Hostname gitlab.debian.net
+  User gitlab
+
+Host grimble.mtfk.de | grimble | mtfk
+  CheckHostIP no
+  Hostname grimble.mtfk.de
+
+Host lion.mjollnir.org | lion
+  Hostname lion.mjollnir.org
   User madduck
 
-Host aika.krafftwerk.de | aika
-  Hostname aika.krafftwerk.de
+### DEFAULTS
+
+Match host *.madduck.net
+  StrictHostKeyChecking ask
+  VerifyHostKeyDNS ask
 
 Host *
-# AddressFamily any
-# BatchMode no
-# CheckHostIP yes
-  Cipher blowfish
-# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr
-# ClearAllForwardings no
-# Compression no
-# CompressionLevel 6
-# ConnectionAttempts 1
+  IgnoreUnknown *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
-  ControlPersist 5
-## DSAAuthentication no
-# DynamicForward off
-# EnableSSHKeysign no
-# EscapeChar ~
+  ControlPersist 30
   ExitOnForwardFailure yes
   ForwardAgent no
-  ForwardX11 no
-# ForwardX11Trusted yes
-# GatewayPorts no
-# GlobalKnownHostsFile /etc/ssh/ssh_known_hosts
+  #ForwardX11 no
+  #ForwardX11Trusted no
   HashKnownHosts no
-# HostbasedAuthentication no
-  HostKeyAlgorithms ssh-rsa
-# IdentityFile ~/.ssh/identity
-  IdentityFile2 ~/.ssh/id_rsa
-  IPQoS lowdelay throughput
-# KbdInteractiveDevices pam
-# LocalCommand none
-# LocalForward none
-# LogLevel INFO
-  MACs hmac-sha1,umac-64@openssh.com,hmac-ripemd160,hmac-sha1-96,hmac-md5,hmac-md5-96
-# NoHostAuthenticationForLocalhost no
   NumberOfPasswordPrompts 2
   PasswordAuthentication yes
-# PermitLocalCommand no
-# Port 22
-# PreferredAuthentications gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
   Protocol 2
-# ProxyCommand
-# PubkeyAuthentication yes
-# RekeyLimit 1G-4G #depends on cipher
-# RemoteForward
-# RhostsRSAAuthentication no
-# RSAAuthentication no
-# ServerAliveCountMax 3
   ServerAliveInterval 45
-  SetupTimeOut 10
-# SmartcardDevice off
   StrictHostKeyChecking yes
-# TCPKeepAlive yes
-# Tunnel no
-# TunnelDevice any:any
-# UsePrivilegedPort no
-# UserKnownHostsFile ~/.ssh/known_hosts
-# VerifyHostKeyDNS no
+  #UpdateHostKeys no
+  VerifyHostKeyDNS ask
   VisualHostKey no
-# XAuthLocation /usr/X11R6/bin/xauth