phasing out mtvic

diff --git a/.ssh/config.in b/.ssh/config.in
index f672ec07b12a8885c34aec796d0bb4759d17ad29..06269ff0025150623adf81932c826badefbae3c0 100644 (file)
--- 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
-  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
 
@@ -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

diff --git a/.ssh/known_hosts.d/mtvic.madduck.net b/.ssh/known_hosts.d/mtvic.madduck.net
index 578430cbcdc9a9629e7deac89a305a7dfd846a94..924622303e9de746c1f9b1b7364717ea73ff09ea 100644 (file)
--- a/.ssh/known_hosts.d/mtvic.madduck.net
+++ b/.ssh/known_hosts.d/mtvic.madduck.net
@@ -1,5 +1 @@
-wall.mtvic.madduck.net,wall.mtvic,wall,192.168.15.1,2406:1e00:b410:100::1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuwGUdpdF+9pbeyhE7MtiqHxqClGO7WH9ojwDJOnEzSM3Z5TiSMHQdksgMHlxikLVSDfY9keWAh3NXvDiRVY8c3i8RVw25PfZ2wPqvPRcn+WA/1mjGg9pKhO+c56Hj1OB6evXlQZSWuCKeGWWyHCPc3TlTp1X3l0Bm3DRQgSsBPdnfGx8YhwqGmkPLhMk6Yhcy1Eun1A20wTWa6ZxnbCg7Rth4ACSkyBx2+mwoZR91jPPb3KPTil2vczwIZHcpbMFrLTHn6tptpc9Aqqreyzbz0cPRTd3+vlMRMkBzTrDNIoliM8gz1J7zcR+3XEsUxyyNbxMa0NK2EkOIH4hNohrFQ==
-julia.mtvic.madduck.net,julia.mtvic,julia,192.168.15.2,2406:1e00:b410:100:226:2dff:fe01:11a5 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA513iTel6XMM30yMtr9p49wJ4OZCA1DDZNWI8wS9M7P+0VAZLp9HaDusG/tW1vxIofmKeEcGWSHBtgEPx9zRwdwHy2btMBS60MEY6UVnA4J+sDdhdb7q2+G867ylKSzdSyQkxN/pyQvYdKlTCu+X0q20eU7UPnP+Lq343IyI5yV2NelFZr9OD07IDtsvTDlpx8qdAeYwYkJNZ0OhIduwxBPvQXd693Jp1jh4PODBiFW7zqpUtrdiQKzbGoDMvjtTPhF/0eigsqWTOlW9jPYrazgZFG8rCtR9qhtT5mEWsS9XEH8YMNsVEtmpiY9R7BoCDMgyYPtk0sEXIrrtYvcKyuw==
-jugband.mtvic.madduck.net,jugband.mtvic,jugband,192.168.15.3,2406:1e00:b410:100:f2de:f1ff:fe6e:9c6c ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHXjjbzWcydsh/GfRvcHYqq5MCRpLrz0eq1DCjdfO+omwIMDGwPoLupq8dpimAiRyQakaSSdP5cxlliCBQbLokg=
-wing.mtvic.madduck.net,wing.mtvic,wing,192.168.15.4,2406:1e00:b410:100:dea6:32ff:fe45:7b57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLV54JxQVCB647mdJ73rt9r8bhyEzOBRv8KXsyJhGAwu6AuxoaTbcAbCD4hJsTb+ibzc9empuR04X+A3/1PzgTo=
 echo.mtvic.madduck.net,echo.mtvic,echo,192.168.14.49,2406:1e00:b410:100:ba27:ebff:fe6e:5d88 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLuuqsEwnXPMis7mNQcT70/IVThXWUMOOXAUWPpEsPUy0LUWy7wHQLyG5HoPPC/baAXEludhXDbeqOdw4SuCBig=