X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/36512bae3305603edb3b39f4dacce71a9fecb5a2..5a8078d8d93a56f3dfb421490cd4326e45ea5450:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 8e49d6d..3ddafb6 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -12,7 +12,7 @@ Host charade-vnc
   ControlPath none
   Hostname charade.madduck.net
 
-Host emily.madduck.net | emily
+Host emily.madduck.net | emily | charade-kvm
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
@@ -22,6 +22,12 @@ Host irc-host.madduck.net | irc-host
   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
   Hostname vizier.madduck.net
@@ -35,6 +41,7 @@ Host ambassador.madduck.net | ambassador
 
 Host alan.madduck.net | alan
   Hostname alan.madduck.net
+  LocalForward localhost:8390 localhost:8384
 Host git.madduck.net | git
   User git
   HostKeyAlias alan.madduck.net
@@ -48,6 +55,9 @@ Host pulse.madduck.net | pulse
 Host vera.madduck.net | vera
   Hostname vera.madduck.net
 
+Host arnold.madduck.net | arnold
+  Hostname arnold.madduck.net
+
 Host seamus.madduck.net | seamus
   Hostname seamus.madduck.net
 
@@ -59,7 +69,7 @@ Host lunatic.madduck.net | lunatic
 
 ### UNI ZURICH MACHINES
 
-Host gig.madduck.net | gig
+Host gig.madduck.net | gig | eugene-kvm
   Hostname gig.madduck.net
 
 Host eugene.madduck.net | eugene
@@ -70,6 +80,8 @@ Host eugene-luks
 
 Host diamond.madduck.net | diamond
   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
@@ -88,6 +100,10 @@ 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
   Hostname shelter.madduck.net
 Host backup.madduck.net | backup
@@ -112,6 +128,8 @@ Host clegg.lehel.madduck.net | clegg.lehel | clegg
 Host albatross.lehel.madduck.net | albatross.lehel | albatross
   Hostname albatross.lehel.madduck.net
   HostKeyAlias albatross.lehel
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
   StrictHostKeyChecking no
@@ -121,10 +139,14 @@ Host albatross-luks
 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 bike.lehel.madduck.net | bike.lehel | bike
-  Hostname bike.lehel.madduck.net
+Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
+  Hostname bike.lehel.vpn.madduck.net
   HostKeyAlias bike.lehel
+  ProxyJump domine.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -132,44 +154,40 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 
 ### GAUTING
 
-Host embryo.gauting.madduck.net | embryo
-  CheckHostIP no
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
-
 Host mother.gauting | mother | mother.gauting.madduck.net
-  Hostname mother.gauting
+  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
   HostKeyAlias mother.gauting.madduck.net
 
-Host visitor*.lehel.madduck.net | visitor*.lehel
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
 ### MTVIC
 
 Host wall.mtvic.madduck.net | wall.mtvic | wall
   Hostname wall.mtvic.madduck.net
 
-Host atom.mtvic.madduck.net | atom.mtvic | atom
-  Hostname atom.mtvic.madduck.net
-
-Host bell.mtvic.madduck.net | bell.mtvic | bell
-  Hostname bell.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
 
 Host julia-via-wall | rjulia
   Hostname julia.mtvic.madduck.net
-  ProxyJump wall.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
 
@@ -177,16 +195,26 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
+### CATALYST
+
+Host atom.catalyst.madduck.net | atom.catalyst | atom
+  Hostname atom.catalyst.vpn.madduck.net
+  HostKeyAlias atom.catalyst.madduck.net
+  CheckHostIP no
+  ProxyJump domine.madduck.net
+
 ### ROAD WARRIORS
 
-Host fishbowl.*
+Host lotus.*
   CheckHostIP no
-  HostKeyAlias fishbowl
+  HostKeyAlias lotus
+  LocalForward localhost:8385 localhost:8384
 
-Host fishbowl | fishbowl.rw.madduck.net
+Host lotus | lotus.rw.madduck.net
   CheckHostIP no
-  HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,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"
+  HostKeyAlias lotus
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,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
@@ -201,12 +229,21 @@ 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
 
@@ -271,7 +308,7 @@ Host github.com | github
 
 Host gitlab.com | gitlab
   Hostname gitlab.com
-  User gitlab
+  User git
 
 Host gitlab.debian.net | git.fosscommunity.in
   Hostname gitlab.debian.net
@@ -285,6 +322,10 @@ Host lion.mjollnir.org | lion
   Hostname lion.mjollnir.org
   User madduck
 
+Host files.northdrive.de | idiotheke
+  Hostname files.northdrive.de
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
@@ -293,11 +334,11 @@ Match host *.madduck.net
 
 Host *
   IgnoreUnknown *
-  ConnectTimeout 10
+  ConnectTimeout 30
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ControlPersist 30
-  ExitOnForwardFailure yes
+  ExitOnForwardFailure no
   ForwardAgent no
   #ForwardX11 no
   #ForwardX11Trusted no