X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/4e8c79b86ceafac37dc8b4b1fdb4d17e5b69d453..1ac63ffa5c915c6c00f4311181b9f2bec5b2d802:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 95dd666..5ff1524 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -5,14 +5,16 @@ Host 127.0.0.1 | localhost
 
 ### CHARADE KVM HOST
 
+Host eclipse.madduck.net | eclipse
+  Hostname eclipse.madduck.net
+Host eclipse-luks
+  Hostname eclipse.madduck.net
+  User root
+
 Host charade.madduck.net | charade
   Hostname charade.madduck.net
-Host charade-vnc
-  ControlMaster no
-  ControlPath none
-  Hostname charade.madduck.net
 
-Host emily.madduck.net | emily | charade-kvm
+Host emily.madduck.net | emily | eclipse-kvm
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
@@ -100,15 +102,20 @@ Host flics.madduck.net | flics
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
-Host domine.madduck.net | domine
-  Hostname domine.madduck.net
-  DynamicForward localhost:9031
-
 Host shelter.madduck.net | shelter
   Hostname shelter.madduck.net
 Host backup.madduck.net | backup
   HostKeyAlias shelter.madduck.net
 
+Host gnome.madduck.net | gnome
+  Hostname gnome.madduck.net
+
+### DOMINE / VPS2DAY
+
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+  DynamicForward localhost:9031
+
 ### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
@@ -167,8 +174,9 @@ Host julia-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host echo.gern.madduck.net | echo.gern | echo
-  Hostname echo.gern.madduck.net
+Host echo.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
+  Hostname echo.kids.gern.madduck.net
+  HostKeyAlias echo.kids.gern.madduck.net
 
 Host visitor*.gern.madduck.net | visitor*.gern
   StrictHostKeyChecking no
@@ -184,7 +192,8 @@ Host lotus.*
 Host lotus | lotus.rw.madduck.net
   CheckHostIP no
   HostKeyAlias lotus
-  #ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,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.{gern,lehel,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 -F -vq0 \${TARGETS%%%%,*} %p"
+  #ProxyUseFdpass yes
   LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -194,13 +203,17 @@ Host ini | ini.dyndns.madduck.net
   Port 13579
   User christine
 
-Host emerald | emerald.rw.madduck.net
+Host emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no
   HostKeyAlias emerald
+  HostName emerald.kids.gern
+  LocalForward localhost:5932 localhost:5900
 
-Host lelina | lelina.rw.madduck.net
+Host lelina | lelina.kids.gern | lelina.rw.madduck.net
   CheckHostIP no
   HostKeyAlias lelina
+  HostName lelina.kids.gern
+  LocalForward localhost:5931 localhost:5900
 
 Host mother
   HostKeyAlias mother