X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/ad84d945f4d76103c06363857543ea21e534c785..7c5fa8e92705cd084dbfe15d32743e4d531be345:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index c30ca37..d469b7c 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -1,5 +1,4 @@
 Host 127.0.0.1 | localhost
-  ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
@@ -7,7 +6,6 @@ Host 127.0.0.1 | localhost
 ### CHARADE KVM HOST
 
 Host charade.madduck.net | charade
-  ForwardAgent yes
   Hostname charade.madduck.net
 Host charade-vnc
   ControlMaster no
@@ -15,15 +13,23 @@ Host charade-vnc
   Hostname charade.madduck.net
 
 Host emily.madduck.net | emily
-  ForwardAgent yes
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
-  ForwardAgent yes
   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
 
 Host vizier.madduck.net | vizier
-  ForwardAgent yes
   Hostname vizier.madduck.net
 Host admin.madduck.net | admin
   Hostname admin.madduck.net
@@ -31,90 +37,48 @@ Host admin.madduck.net | admin
   User git
 
 Host ambassador.madduck.net | ambassador
-  ForwardAgent yes
   Hostname ambassador.madduck.net
 
 Host alan.madduck.net | alan
-  ForwardAgent yes
   Hostname alan.madduck.net
+  LocalForward localhost:8390 localhost:8384
+Host git.madduck.net | git
+  User git
+  HostKeyAlias alan.madduck.net
 
 Host swan.madduck.net | swan
-  ForwardAgent yes
   Hostname swan.madduck.net
-Host irc-host.madduck.net | irc-host
-  User madduck
-  HostKeyAlias swan.madduck.net
-  ConnectTimeout 60
 
 Host pulse.madduck.net | pulse
-  ForwardAgent yes
   Hostname pulse.madduck.net
 
+Host vera.madduck.net | vera
+  Hostname vera.madduck.net
+
 Host seamus.madduck.net | seamus
-  ForwardAgent yes
   Hostname seamus.madduck.net
 
-### KHYBER KVM HOST
+Host cymbaline.madduck.net | cymbaline
+  Hostname cymbaline.madduck.net
 
-Host khyber.madduck.net | khyber
-  ForwardAgent yes
-  Hostname khyber.madduck.net
-Host khyber-vnc
-  ControlMaster no
-  ControlPath none
-  Hostname khyber.madduck.net
-
-Host bike.madduck.net | bike
-  ForwardAgent yes
-  Hostname bike.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 lotus.madduck.net
-Host phd.martin-krafft.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
-Host madduck.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
+Host lunatic.madduck.net | lunatic
+  Hostname lunatic.madduck.net
 
-Host jugband.madduck.net | jugband
-  ForwardAgent yes
-  Hostname jugband.madduck.net
+### UNI ZURICH MACHINES
 
-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 gig.madduck.net | gig
+  Hostname gig.madduck.net
 
-### UNI ZURICH MACHINES
+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
+  DynamicForward localhost:9041
 Host debian.madduck.net | debian
   HostKeyAlias diamond.madduck.net
 Host scratch.madduck.net | scratch
@@ -133,22 +97,15 @@ Host flics.madduck.net | flics
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+  DynamicForward localhost:9031
+
 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
-
 ### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
@@ -159,124 +116,154 @@ Host piper.madduck.net | piper
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.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
-
-### GERN
-
-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
-  ForwardX11 yes
-
-Host git.gern.madduck.net | git.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-Host annex.gern.madduck.net | annex.gern
-  ForwardAgent yes
-  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
-  ForwardAgent yes
-  ForwardX11 yes
-
-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
   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
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
+Host albatross-luks
+  Hostname albatross.lehel.madduck.net
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  User root
 
-### GAUTING
+Host albatross-via-clegg | ralbatross
+  Hostname albatross.lehel.madduck.net
+  ProxyJump clegg.dyndns.madduck.net
+  AddressFamily inet
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
 
-Host embryo.gauting.madduck.net | embryo
-  CheckHostIP no
-  ForwardAgent yes
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
+Host bike.lehel.madduck.net | bike.lehel | bike
+  Hostname bike.lehel.madduck.net
+  HostKeyAlias bike.lehel
+
+Host visitor*.lehel.madduck.net | visitor*.lehel
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### 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 22021
+  Hostname mother.dyndns.madduck.net
+  Port 22221
   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
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias brick.gauting.madduck.net
+Host bell.gauting | bell | bell.gauting.madduck.net
+  Hostname bell.fritz.box
+  HostKeyAlias bell.gauting.madduck.net
+
+### 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 julia.mtvic.madduck.net | julia.mtvic | julia
+  Hostname julia.mtvic.madduck.net
+  LocalForward localhost:8388 localhost:8384
 
-### MOUNT VICTORIA
+Host julia-via-wall | rjulia
+  Hostname julia.mtvic.madduck.net
+  ProxyJump wall-ipv4
+  LocalForward localhost:8388 localhost:8384
 
-Host atom.mtvic.madduck.net | atom.mtvic | atom
-  Hostname atom.mtvic.madduck.net
-  ForwardAgent yes
+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 fishbowl
+  LocalForward localhost:8386 localhost:8384
 
 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"
+  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 lotus.*
+  CheckHostIP no
+  HostKeyAlias lotus
+  LocalForward localhost:8385 localhost:8384
+
+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 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:8383 localhost:8384
+
+Host tethered-sgs7e
+  Port 2222
+  User shell
+  HostName 192.168.43.1
+  HostKeyAlias sgs7e.phones
+  LocalForward localhost:8383 localhost:8384
+
+Host sgs5m | sgs5m.phones.*
+  User shell
+  HostName sgs5m.phones
+  HostKeyAlias sgs5m.phones
+  LocalForward localhost:8382 localhost:8384
 
 ### LOCAL VIRT HOSTS
 
 Host red | green | blue | yellow | black | white | orange | violet | wafer
-  VerifyHostKeyDNS no
-  CheckHostIP no
-  ForwardAgent yes
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-  ControlMaster no
   CanonicalDomains virt
   CanonicalizeHostname yes
   CanonicalizeFallbackLocal no
   CanonicalizeMaxDots 0
+  VerifyHostKeyDNS no
+  CheckHostIP no
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### DEBIAN
 
@@ -299,36 +286,22 @@ Match host *.debian.org
 
 Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
   Hostname nelson.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  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
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
-
-### PENNY
-
-Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
-  Hostname lion.mjollnir.org
+  ProxyJump sysyphus.madduck.net
 
 ### 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
 
 Host workbuffer.org | nz
@@ -341,6 +314,22 @@ Host github.com | github
   Hostname github.com
   User git
 
+Host gitlab.com | gitlab
+  Hostname gitlab.com
+  User git
+
+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
+
 ### DEFAULTS
 
 Match host *.madduck.net
@@ -353,16 +342,16 @@ Host *
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ControlPersist 30
-  ExitOnForwardFailure yes
+  ExitOnForwardFailure no
   ForwardAgent no
-  ForwardX11 no
-  ForwardX11Trusted no
+  #ForwardX11 no
+  #ForwardX11Trusted no
   HashKnownHosts no
   NumberOfPasswordPrompts 2
   PasswordAuthentication yes
   Protocol 2
   ServerAliveInterval 45
   StrictHostKeyChecking yes
-  UpdateHostKeys ask
+  #UpdateHostKeys no
   VerifyHostKeyDNS ask
   VisualHostKey no