fix up completion for ssh functions

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

diff --git a/.ssh/config.in b/.ssh/config.in
index 9ccd86b8d0d4a5f2e808ba624130d9cd6f4546c4..18af8a26f4d237f1138f84bedd4c5c716c10dd7c 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -12,7 +12,7 @@ Host charade-vnc
   ControlPath none
   Hostname charade.madduck.net
 
-Host emily.madduck.net | emily
+Host emily.madduck.net | emily | charade-kvm
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
@@ -28,7 +28,6 @@ Host ssh443
   Hostname matilda.madduck.net
   Port 443
   ConnectTimeout 60
-  DynamicForward 9001
 
 Host vizier.madduck.net | vizier
   Hostname vizier.madduck.net
@@ -42,6 +41,7 @@ Host ambassador.madduck.net | ambassador
 
 Host alan.madduck.net | alan
   Hostname alan.madduck.net
+  LocalForward localhost:8390 localhost:8384
 Host git.madduck.net | git
   User git
   HostKeyAlias alan.madduck.net
@@ -69,7 +69,7 @@ Host lunatic.madduck.net | lunatic
 Host gig.madduck.net | gig
   Hostname gig.madduck.net
 
-Host eugene.madduck.net | eugene
+Host eugene.madduck.net | eugene | eugene-kvm
   Hostname eugene.madduck.net
 Host eugene-luks
   Hostname eugene.madduck.net
@@ -77,6 +77,8 @@ Host eugene-luks
 
 Host diamond.madduck.net | diamond
   Hostname diamond.madduck.net
+  LocalForward localhost:8389 localhost:8384
+  DynamicForward localhost:9041
 Host debian.madduck.net | debian
   HostKeyAlias diamond.madduck.net
 Host scratch.madduck.net | scratch
@@ -97,6 +99,7 @@ Host flics.madduck.net | flics
 
 Host domine.madduck.net | domine
   Hostname domine.madduck.net
+  DynamicForward localhost:9031
 
 Host shelter.madduck.net | shelter
   Hostname shelter.madduck.net
@@ -122,6 +125,8 @@ Host clegg.lehel.madduck.net | clegg.lehel | clegg
 Host albatross.lehel.madduck.net | albatross.lehel | albatross
   Hostname albatross.lehel.madduck.net
   HostKeyAlias albatross.lehel
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
   StrictHostKeyChecking no
@@ -132,8 +137,10 @@ Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
   ProxyJump clegg.dyndns.madduck.net
   AddressFamily inet
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
 
-Host bike.lehel.madduck.net | bike.lehel | bike
+Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
   Hostname bike.lehel.madduck.net
   HostKeyAlias bike.lehel
 
@@ -143,26 +150,19 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 
 ### GAUTING
 
-Host embryo.gauting.madduck.net | embryo
-  CheckHostIP no
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
-
 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
+  Hostname mother.fritz.box
+  HostKeyAlias mother.gauting.madduck.net
+
 Host mothere
-  Hostname embryo.gauting.madduck.net
-  Port 22021
+  Hostname mother.dyndns.madduck.net
+  Port 22221
   CheckHostIP no
   HostKeyAlias mother.gauting.madduck.net
 
-Host visitor*.lehel.madduck.net | visitor*.lehel
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
+Host bell.gauting | bell | bell.gauting.madduck.net
+  Hostname bell.fritz.box
+  HostKeyAlias bell.gauting.madduck.net
 
 ### MTVIC
 
@@ -173,15 +173,14 @@ Host wall-ipv4
   Hostname wall.mtvic.madduck.net
   AddressFamily inet
 
-Host bell.mtvic.madduck.net | bell.mtvic | bell
-  Hostname bell.mtvic.madduck.net
-
 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
+  LocalForward localhost:8388 localhost:8384
 
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
@@ -206,20 +205,24 @@ Host atom.catalyst.madduck.net | atom.catalyst | atom
 Host fishbowl.*
   CheckHostIP no
   HostKeyAlias fishbowl
+  LocalForward localhost:8386 localhost:8384
 
 Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
   HostKeyAlias fishbowl
   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"
+  LocalForward localhost:8386 localhost:8384
 
 Host lotus.*
   CheckHostIP no
   HostKeyAlias lotus
+  LocalForward localhost:8385 localhost:8384
 
 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"
+  LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
   CheckHostIP no
@@ -235,17 +238,20 @@ Host sgs7e | sgs7e.phones.*
   User shell
   HostName sgs7e.phones
   HostKeyAlias sgs7e.phones
+  LocalForward localhost:8383 localhost:8384
 
 Host tethered-sgs7e
   Port 2222
   User shell
   HostName 192.168.43.1
   HostKeyAlias sgs7e.phones
+  LocalForward localhost:8383 localhost:8384
 
 Host sgs5m | sgs5m.phones.*
   User shell
   HostName sgs5m.phones
   HostKeyAlias sgs5m.phones
+  LocalForward localhost:8382 localhost:8384
 
 ### LOCAL VIRT HOSTS
 
@@ -332,11 +338,11 @@ Match host *.madduck.net
 
 Host *
   IgnoreUnknown *
-  ConnectTimeout 10
+  ConnectTimeout 30
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ControlPersist 30
-  ExitOnForwardFailure yes
+  ExitOnForwardFailure no
   ForwardAgent no
   #ForwardX11 no
   #ForwardX11Trusted no