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

diff --git a/.ssh/config.in b/.ssh/config.in
index a343378..a0ddd72 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -151,34 +151,27 @@ 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.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
+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.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
+  Hostname echo.kids.gern.madduck.net
+  HostKeyAlias echo.kids.gern.madduck.net
 
-Host visitor*.mtvic.madduck.net | visitor*.mtvic
+Host visitor*.gern.madduck.net | visitor*.gern
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
@@ -192,7 +185,8 @@ 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 -F -vq0 \${TARGETS%%%%,*} %p"
+  #ProxyUseFdpass yes
   LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -202,13 +196,17 @@ Host ini | ini.dyndns.madduck.net
   Port 13579
   User christine
 
-Host emerald | emerald.rw.madduck.net
+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.rw.madduck.net
+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
@@ -246,6 +244,7 @@ Host tethered-sgs7e
   LocalForward localhost:8382 localhost:8384
 
 Host sgs5m | sgs5m.phones.*
+  Port 2222
   User shell
   HostName sgs5m.phones
   HostKeyAlias sgs5m.phones