X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/efe3bd3bf93c660537084682653599f80b7c6e29..546404dc86b9346dee01ea623bff9aa72c4968f7:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 8ceab5b..38b85d5 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -5,14 +5,17 @@ Host 127.0.0.1 | localhost
 
 ### CHARADE KVM HOST
 
+Host eclipse.madduck.net | eclipse
+  Hostname eclipse.madduck.net
+Host eclipse-luks
+  Hostname eclipse.madduck.net
+  AddressFamily inet
+  User root
+
 Host charade.madduck.net | charade
   Hostname charade.madduck.net
-Host charade-vnc
-  ControlMaster no
-  ControlPath none
-  Hostname charade.madduck.net
 
-Host emily.madduck.net | emily
+Host emily.madduck.net | emily | eclipse-kvm
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
@@ -55,6 +58,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
 
@@ -66,13 +72,14 @@ 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
   Hostname eugene.madduck.net
 Host eugene-luks
   Hostname eugene.madduck.net
+  AddressFamily inet
   User root
 
 Host diamond.madduck.net | diamond
@@ -97,15 +104,20 @@ 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
   HostKeyAlias shelter.madduck.net
 
+Host gnome.madduck.net | gnome
+  Hostname gnome.madduck.net
+
+### DOMINE / VPS2DAY
+
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+  DynamicForward localhost:9031
+
 ### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
@@ -129,8 +141,7 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   DynamicForward localhost:9049
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
+  AddressFamily inet
   User root
 
 Host albatross-via-clegg | ralbatross
@@ -140,79 +151,41 @@ Host albatross-via-clegg | ralbatross
   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
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-### GAUTING
-
-Host mother.gauting | mother | mother.gauting.madduck.net
-  Hostname mother.fritz.box
-  HostKeyAlias mother.gauting.madduck.net
-
-Host mothere
-  Hostname mother.dyndns.madduck.net
-  Port 22221
-  CheckHostIP no
-  HostKeyAlias mother.gauting.madduck.net
-
-Host bell.gauting | bell | bell.gauting.madduck.net
-  Hostname bell.fritz.box
-  HostKeyAlias bell.gauting.madduck.net
-
-### MTVIC
+### GERN
 
-Host wall.mtvic.madduck.net | wall.mtvic | wall
-  Hostname wall.mtvic.madduck.net
+Host wall.gern.madduck.net | wall.gern | wall
+  Hostname wall.gern.madduck.net
+  HostKeyAlias wall.gern.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-ipv4
+Host julia.gern.madduck.net | julia.gern | julia
+  Hostname julia.gern.madduck.net
+  HostKeyAlias julia.gern.madduck.net
   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
+Host julia-luks
+  Hostname julia.gern.madduck.net
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
+  AddressFamily inet
+  User root
 
-### CATALYST
+Host echo.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
+  Hostname echo.kids.gern.madduck.net
+  HostKeyAlias echo.kids.gern.madduck.net
 
-Host atom.catalyst.madduck.net | atom.catalyst | atom
-  Hostname atom.catalyst.madduck.net
+Host visitor*.gern.madduck.net | visitor*.gern
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### ROAD WARRIORS
 
-Host fishbowl.*
-  CheckHostIP no
-  HostKeyAlias fishbowl
-  LocalForward localhost:8386 localhost:8384
-
-Host fishbowl | fishbowl.rw.madduck.net
-  CheckHostIP no
-  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 lotus.*
   CheckHostIP no
   HostKeyAlias lotus
@@ -221,7 +194,8 @@ Host lotus.*
 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"
+  #ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,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 -F -vq0 \${TARGETS%%%%,*} %p"
+  #ProxyUseFdpass yes
   LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -231,27 +205,59 @@ Host ini | ini.dyndns.madduck.net
   Port 13579
   User christine
 
+Host emerald | emerald.kids.gern | emerald.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias emerald
+  HostName emerald.kids.gern
+  LocalForward localhost:5932 localhost:5900
+
+Host lelina | lelina.kids.gern | lelina.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias lelina
+  HostName lelina.kids.gern
+  LocalForward localhost:5931 localhost:5900
+
+Host mother
+  HostKeyAlias mother
+  Hostname mother.rw.vpn.madduck.net
+  CheckHostIP no
+
 ### PHONES
 
+Host oneplus5t | oneplus5t.phones.*
+  Port 2222
+  User shell
+  HostName oneplus5t.phones
+  HostKeyAlias oneplus5t.phones
+  LocalForward localhost:8383 localhost:8384
+
+Host tethered-oneplus5t
+  Port 2222
+  User shell
+  HostName 192.168.43.1
+  HostKeyAlias oneplus5t.phones
+  LocalForward localhost:8383 localhost:8384
+
 Host sgs7e | sgs7e.phones.*
   Port 2222
   User shell
   HostName sgs7e.phones
   HostKeyAlias sgs7e.phones
-  LocalForward localhost:8383 localhost:8384
+  LocalForward localhost:8382 localhost:8384
 
 Host tethered-sgs7e
   Port 2222
   User shell
   HostName 192.168.43.1
   HostKeyAlias sgs7e.phones
-  LocalForward localhost:8383 localhost:8384
+  LocalForward localhost:8382 localhost:8384
 
 Host sgs5m | sgs5m.phones.*
+  Port 2222
   User shell
   HostName sgs5m.phones
   HostKeyAlias sgs5m.phones
-  LocalForward localhost:8382 localhost:8384
+  LocalForward localhost:8381 localhost:8384
 
 ### LOCAL VIRT HOSTS
 
@@ -330,6 +336,16 @@ Host lion.mjollnir.org | lion
   Hostname lion.mjollnir.org
   User madduck
 
+Host files.northdrive.de | idiotheke | seamus.northdrive.de
+  Hostname seamus.northdrive.de
+  Port 37819
+  HostKeyAlias seamus.northdrive.de
+  User madduck
+
+Host clegg.northdrive.de
+  Port 37819
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
@@ -338,11 +354,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