X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/c00e46840e60b230c4b0575d1cc44533fbd01cc0..b38736a01f2ca7172fc6f7373d6c6b8bf162ffa8:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 735f908..53e6374 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -155,9 +155,10 @@ Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern |
 
 ### KRAFFTWERK
 
-Host albatross.toni.madduck.net | albatross
+Host albatross.fo.krafftwerk.de | albatross
   HostName albatross.fo.krafftwerk.de
   HostKeyAlias albatross.fo.krafftwerk.de
+  ForwardAgent yes
   LocalForward localhost:8387 localhost:8384
   DynamicForward localhost:9049
 Host albatross-luks
@@ -166,11 +167,16 @@ 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
   Hostname gerald.int.toni.immo
   HostKeyAlias gerald.toni.madduck.net
+  ForwardAgent yes
 
 Host dc01.samba-ad.toni.immo | dc01
   Hostname dc01.samba-ad.toni.immo
@@ -207,6 +213,7 @@ Host docspell.int.toni.immo | docspell
 Host paperless.int.toni.immo | paperless
   Hostname paperless.int.toni.immo
   HostKeyAlias paperless.int.toni.immo
+  ForwardAgent yes
 
 Host dovecot.int.toni.immo | dovecot
   Hostname dovecot.int.toni.immo
@@ -233,16 +240,33 @@ Host pve-backups.toni.immo | pve-backups
 ### ROAD WARRIORS
 
 Host lotus.gern
-  HostKeyAlias lotus
+  HostName lotus
+  ConnectTimeout 120
+  ForwardAgent yes
+  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
   HostKeyAlias lotus
+  ForwardAgent yes
+  HostName lotus.fo.krafftwerk.de
   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'
+
 Host emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no
   HostKeyAlias emerald