X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/a2195f9dc4a220f724ef0f92d7ee6f2987cc31bb..f985d2d64092affec3210231eae55230d7f44c81:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index 9bc791b..5cb17cc 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -146,51 +146,30 @@ Host albatross-via-clegg | ralbatross
 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
   UserKnownHostsFile /dev/null
 
-### GAUTING
+### GERN
 
-Host mother.gauting | mother | mother.gauting.madduck.net
-  Hostname mother.fritz.box
-  HostKeyAlias mother.gauting.madduck.net
+Host wall.gern.madduck.net | wall.gern | wall
+  Hostname wall.gern.madduck.net
 
-Host mothere
-  HostKeyAlias mother.gauting.madduck.net
-  Hostname mother.rw.vpn.madduck.net
-  ProxyJump domine.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
-
-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 julia-luks
+  Hostname julia.gern.madduck.net
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  User root
 
-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 echo.gern.madduck.net | echo.gern | echo
+  Hostname echo.gern.madduck.net
 
-Host visitor*.mtvic.madduck.net | visitor*.mtvic
+Host visitor*.gern.madduck.net | visitor*.gern
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
@@ -204,7 +183,7 @@ Host lotus.*
 Host lotus | lotus.rw.madduck.net
   CheckHostIP no
   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"
+  #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 -vq0 \${TARGETS%%%%,*} %p"
   LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -214,27 +193,55 @@ Host ini | ini.dyndns.madduck.net
   Port 13579
   User christine
 
+Host emerald | emerald.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias emerald
+
+Host lelina | lelina.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias lelina
+
+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