X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/9bb4ad96b827573d23b79157202a18dcb0dd7b01..6b87f90ed79ac94c90e92e6cb01b0fbd0bf9e577:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 1c047ac..18af8a2 100644
--- 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
@@ -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
@@ -140,7 +140,7 @@ Host albatross-via-clegg | ralbatross
   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
 
@@ -156,10 +156,14 @@ Host mother.gauting | mother | mother.gauting.madduck.net
 
 Host mothere
   Hostname mother.dyndns.madduck.net
-  Port 22021
+  Port 22221
   CheckHostIP no
   HostKeyAlias mother.gauting.madduck.net
 
+Host bell.gauting | bell | bell.gauting.madduck.net
+  Hostname bell.fritz.box
+  HostKeyAlias bell.gauting.madduck.net
+
 ### MTVIC
 
 Host wall.mtvic.madduck.net | wall.mtvic | wall
@@ -169,9 +173,6 @@ 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
@@ -337,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