X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/4b92361159692b8625cce19620aa589b52f93418..21498e025c18d58945f48114f2583143a5db1177:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 7282c11..8dc38f1 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -22,6 +22,13 @@ Host irc-host.madduck.net | irc-host
   HostKeyAlias matilda.madduck.net
   Hostname matilda.madduck.net
   ConnectTimeout 60
+Host ssh443
+  User madduck
+  HostKeyAlias matilda.madduck.net
+  Hostname matilda.madduck.net
+  Port 443
+  ConnectTimeout 60
+  DynamicForward 9001
 
 Host vizier.madduck.net | vizier
   Hostname vizier.madduck.net
@@ -88,6 +95,9 @@ Host flics.madduck.net | flics
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+
 Host shelter.madduck.net | shelter
   Hostname shelter.madduck.net
 Host backup.madduck.net | backup
@@ -121,6 +131,7 @@ Host albatross-luks
 Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
   ProxyJump clegg.dyndns.madduck.net
+  AddressFamily inet
 
 Host bike.lehel.madduck.net | bike.lehel | bike
   Hostname bike.lehel.madduck.net
@@ -139,6 +150,10 @@ Host embryo.gauting.madduck.net | embryo
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting
+Host mother-via-embryo
+  Hostname mother.gauting
+  ProxyJump embryo.gauting.madduck.net
+  AddressFamily inet
 Host mothere
   Hostname embryo.gauting.madduck.net
   Port 22021
@@ -154,8 +169,9 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 Host wall.mtvic.madduck.net | wall.mtvic | wall
   Hostname wall.mtvic.madduck.net
 
-Host atom.mtvic.madduck.net | atom.mtvic | atom
-  Hostname atom.mtvic.madduck.net
+Host wall-ipv4
+  Hostname wall.mtvic.madduck.net
+  AddressFamily inet
 
 Host bell.mtvic.madduck.net | bell.mtvic | bell
   Hostname bell.mtvic.madduck.net
@@ -165,15 +181,26 @@ Host julia.mtvic.madduck.net | julia.mtvic | julia
 
 Host julia-via-wall | rjulia
   Hostname julia.mtvic.madduck.net
-  ProxyJump wall.mtvic.madduck.net
+  ProxyJump wall-ipv4
 
 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
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
+### CATALYST
+
+Host atom.catalyst.madduck.net | atom.catalyst | atom
+  Hostname atom.catalyst.madduck.net
+
 ### ROAD WARRIORS
 
 Host fishbowl.*
@@ -183,7 +210,16 @@ Host fishbowl.*
 Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
   HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,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.{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"
+
+Host lotus.*
+  CheckHostIP no
+  HostKeyAlias 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"
 
 Host ini | ini.dyndns.madduck.net
   CheckHostIP no
@@ -205,6 +241,11 @@ Host tethered-sgs7e
   HostName 192.168.43.1
   HostKeyAlias sgs7e.phones
 
+Host sgs5m | sgs5m.phones.*
+  User shell
+  HostName sgs5m.phones
+  HostKeyAlias sgs5m.phones
+
 ### LOCAL VIRT HOSTS
 
 Host red | green | blue | yellow | black | white | orange | violet | wafer
@@ -250,11 +291,6 @@ Host kent.debconf.org | kent
 
 ### TILDE CLUB
 
-Host remotes.club
-  Hostname remotes.club
-  Port 9022
-  User madduck
-
 Host squiggle.city
   Hostname squiggle.city
   User madduck
@@ -273,7 +309,7 @@ Host github.com | github
 
 Host gitlab.com | gitlab
   Hostname gitlab.com
-  User gitlab
+  User git
 
 Host gitlab.debian.net | git.fosscommunity.in
   Hostname gitlab.debian.net