X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/83c4a70757f91a9aef76fc0ae0d7fa8b29003a8d..2cb59c873c1807b0e89fbac9c561b3e3dc46e55f:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 1dff9d9..3b5595e 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -138,7 +138,7 @@ Host albatross-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-clegg
+Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
   ProxyJump clegg.dyndns.madduck.net
 
@@ -172,22 +172,34 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 
 ### MTVIC
 
+Host wall.mtvic.madduck.net | wall.mtvic | wall
+  Hostname wall.mtvic.madduck.net
+  ForwardAgent yes
+
 Host atom.mtvic.madduck.net | atom.mtvic | atom
   Hostname atom.mtvic.madduck.net
   ForwardAgent yes
 
-Host atom-via-sysyphus
-  HostKeyAlias atom.mtvic.madduck.net
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 localhost 22015
+Host bell.mtvic.madduck.net | bell.mtvic | bell
+  Hostname bell.mtvic.madduck.net
+  ForwardAgent yes
 
 Host julia.mtvic.madduck.net | julia.mtvic | julia
   Hostname julia.mtvic.madduck.net
   ForwardAgent yes
 
+Host julia-via-wall | rjulia
+  Hostname julia.mtvic.madduck.net
+  ProxyJump wall.mtvic.madduck.net
+
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
   ForwardAgent yes
 
+Host lelina.mtvic.madduck.net | lelina.mtvic | lelina
+  ForwardX11 yes
+  ForwardAgent yes
+
 ### ROAD WARRIORS
 
 Host fishbowl.*
@@ -203,6 +215,13 @@ Host fishbowl | fishbowl.rw.madduck.net
   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"
 
+Host ini | ini.dyndns.madduck.net
+  CheckHostIP no
+  HostKeyAlias ini.dyndns.madduck.net
+  HostName ini.dyndns.madduck.net
+  Port 13579
+  User christine
+
 ### PHONES
 
 Host sgs7e | sgs7e.phones.*