android ssh has a different username

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index e388965edb7134fb6d9a6c004bc4b9cbf64e18ca..9f6d9d81860450fb44ed3d4d34225438078f06bf 100644 (file)
--- 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
@@ -137,9 +138,9 @@ Host albatross-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-diamond
+Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
-  ProxyJump diamond.madduck.net
+  ProxyJump clegg.dyndns.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -169,20 +170,36 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-### MOUNT VICTORIA
+### 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 | chip
+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.*
@@ -196,15 +213,28 @@ 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"
+
+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.*
   Port 2222
-  User admin
+  User shell
   HostName sgs7e.phones
 
+Host tethered-sgs7e
+  Port 2222
+  User shell
+  HostName 192.168.43.1
+  HostKeyAlias sgs7e.phones
+
 ### LOCAL VIRT HOSTS
 
 Host wafer.virt