X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/c70e17197e8bbd97276b82eae72a8a599d9f7016..9c96f14c761024560cf29e3da8cc28abbf13b70d:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index a343378..06269ff 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -151,34 +151,22 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-### MTVIC
+### GERN
 
-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
+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 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 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
 
@@ -192,7 +180,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
@@ -246,6 +234,7 @@ Host tethered-sgs7e
   LocalForward localhost:8382 localhost:8384
 
 Host sgs5m | sgs5m.phones.*
+  Port 2222
   User shell
   HostName sgs5m.phones
   HostKeyAlias sgs5m.phones