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

diff --git a/.ssh/config.in b/.ssh/config.in
index a9b5373..1dff9d9 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -24,6 +24,7 @@ Host matilda.madduck.net | matilda
 Host irc-host.madduck.net | irc-host
   User madduck
   HostKeyAlias matilda.madduck.net
+  Hostname matilda.madduck.net
   ConnectTimeout 60
 
 Host vizier.madduck.net | vizier
@@ -119,47 +120,6 @@ Host piper.madduck.net | piper
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.madduck.net
 
-### GERN
-
-Host wall.gern.madduck.net | wall
-  CheckHostIP no
-  ForwardAgent yes
-  Hostname wall.gern.madduck.net
-
-Host julia.gern.madduck.net | julia
-  Hostname julia.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-
-Host julia-via-diamond
-  Hostname julia.gern.madduck.net
-  ProxyJump diamond.madduck.net
-
-Host git.gern.madduck.net | git.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-Host annex.gern.madduck.net | annex.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-Host shared.gern.madduck.net | shared.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-
-Host pict.gern.madduck.net | pict
-  Hostname pict.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-
-Host jugband.gern.madduck.net | jugband.gern | jugband
-  Hostname jugband.gern.madduck.net
-  ForwardX11 yes
-  ForwardAgent yes
-  HostKeyAlias jugband.gern
-
-Host visitor*.gern.madduck.net | visitor*.gern | visitor*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
 ### LEHEL
 
 Host clegg.lehel.madduck.net | clegg.lehel | clegg
@@ -178,9 +138,9 @@ Host albatross-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-diamond
+Host albatross-via-clegg
   Hostname albatross.lehel.madduck.net
-  ProxyJump diamond.madduck.net
+  ProxyJump clegg.dyndns.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -210,7 +170,7 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-### MOUNT VICTORIA
+### MTVIC
 
 Host atom.mtvic.madduck.net | atom.mtvic | atom
   Hostname atom.mtvic.madduck.net
@@ -220,8 +180,12 @@ 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 | chip
-  Hostname bell.mtvic.madduck.net
+Host julia.mtvic.madduck.net | julia.mtvic | julia
+  Hostname julia.mtvic.madduck.net
+  ForwardAgent yes
+
+Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
+  Hostname jugband.mtvic.madduck.net
   ForwardAgent yes
 
 ### ROAD WARRIORS
@@ -237,7 +201,7 @@ Host fishbowl | fishbowl.rw.madduck.net
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,gauting,mtvic,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,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"
 
 ### PHONES
 
@@ -246,6 +210,12 @@ Host sgs7e | sgs7e.phones.*
   User admin
   HostName sgs7e.phones
 
+Host tethered-sgs7e
+  Port 2222
+  User admin
+  HostName 192.168.43.1
+  HostKeyAlias sgs7e.phones
+
 ### LOCAL VIRT HOSTS
 
 Host wafer.virt