X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/2555490d1d9349e3b19f653ac5d6148ac32f98aa..d5dc039417049144c9fa4b7ab892f6bf983d9421:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 3f735ac..7587b23 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -15,8 +15,9 @@ Host eclipse-luks
 Host eclipse-fallback.madduck.net | eclipse-fallback
   HostKeyAlias eclipse.madduck.net
 
-Host emily.madduck.net | emily | eclipse-kvm
-  Hostname emily.madduck.net
+Host eclipse-kvm
+  Hostname 212.18.21.166
+  User martinkrafft
 
 Host matilda.madduck.net | matilda
   Hostname matilda.madduck.net
@@ -167,6 +168,10 @@ Host albatross-luks
   AddressFamily inet
   User root
 
+Host docker.fo.krafftwerk.de | dockerkr
+  HostName docker.fo.krafftwerk.de
+  HostKeyAlias docker.fo.krafftwerk.de
+
 ### TONI
 
 Host gerald.toni.madduck.net | gerald.toni | gerald | gerald.int.toni.immo | martin.int.toni.immo
@@ -182,6 +187,10 @@ Host pve.int.toni.immo | pve
   Hostname pve.int.toni.immo
   HostKeyAlias pve.int.toni.immo
 
+Host pve-crypt
+  Hostname 192.168.231.10
+  Port 60022
+
 Host fileserver.int.toni.immo | fileserver
   Hostname fileserver.int.toni.immo
   HostKeyAlias fileserver.int.toni.immo
@@ -239,29 +248,31 @@ Host lotus.gern
   HostName lotus
   ConnectTimeout 120
   ForwardAgent yes
-  ProxyCommand ssh wall.gern.madduck.net "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
+  ProxyCommand ssh wall.gern.madduck.net "n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
   LocalForward localhost:8385 localhost:8384
 
 Host lotus.gern-vnc
   HostName lotus
   ConnectTimeout 120
-  ProxyCommand ssh wall.gern.madduck.net "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
+  ProxyCommand ssh wall.gern.madduck.net "n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
   LocalForward localhost:8385 localhost:8384
   RemoteCommand pkill x11vnc; x11vnc -display :0 -nopw -localhost -norepeat -gone '/usr/bin/xautolock -locknow'
 
 Host lotus.* | lotus
-  CheckHostIP no
+  HostName lotus.fo.krafftwerk.de
   HostKeyAlias lotus
+  ConnectTimeout 120
   ForwardAgent yes
-  HostName lotus.fo.krafftwerk.de
+  ProxyCommand sh -c 'for i in 1 2 3; do wakeonlan -i 192.168.235.255 dc:fb:48:35:03:04 && sleep $i && socat - TCP:%h:%p,connect-timeout=120 && break; done'
   LocalForward localhost:8385 localhost:8384
 
 Host lotus-vnc
   HostName lotus.fo.krafftwerk.de
   HostKeyAlias lotus
   ConnectTimeout 120
-  LocalForward localhost:5960 localhost:5900
-  RemoteCommand pkill x11vnc; x11vnc -display :0 -nopw -localhost -norepeat -gone '/usr/bin/xautolock -locknow'
+  ProxyCommand sh -c 'for i in 1 2 3; do wakeonlan -i 192.168.235.255 dc:fb:48:35:03:04 && sleep $i && socat - TCP:%h:%p,connect-timeout=120 && break; done'
+  RemoteCommand pkill x11vnc; x11vnc -display :0 -rfbport 5960 -nopw -localhost -norepeat -gone '/usr/bin/xautolock -locknow'
+  LocalForward localhost:5960 localhost:5960
 
 Host emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no