X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/819eb05e3b6ef71570532368c6d7f19630a3d388..e3bb5f4619a2d136b2f76e00a462dbafd0fd8327:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index c0aea81..8f901d9 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -3,6 +3,12 @@ Host 127.0.0.1 | localhost
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
+### VIRT
+
+Host tournamentsoftware.siby | ts
+  Hostname tournamentsoftware.siby
+  User martin
+
 ### ECLIPSE KVM HOST
 
 Host eclipse.madduck.net | eclipse
@@ -15,8 +21,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
@@ -149,6 +156,10 @@ Host echo.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
   Hostname echo.kids.gern.madduck.net
   HostKeyAlias echo.kids.gern.madduck.net
 
+Host mqtt.smarthome.gern | mqtt
+  Hostname mqtt.smarthome.gern
+  User root
+
 Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern | 10.39.*.*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
@@ -171,6 +182,12 @@ Host docker.fo.krafftwerk.de | dockerkr
   HostName docker.fo.krafftwerk.de
   HostKeyAlias docker.fo.krafftwerk.de
 
+Host cloud-backups.krafftwerk.de | cloud-backups
+  Hostname cloud-backups.krafftwerk.de
+  HostKeyAlias cloud-backups.krafftwerk.de
+  Port 23
+  User u441943
+
 ### TONI
 
 Host gerald.toni.madduck.net | gerald.toni | gerald | gerald.int.toni.immo | martin.int.toni.immo
@@ -250,26 +267,13 @@ Host lotus.gern
   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 "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'
+  ForwardAgent yes
+  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 emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no
@@ -331,6 +335,13 @@ Host clegg.northdrive.de
   Port 37819
   User madduck
 
+### INCLUDES
+
+Match tagged vnc
+  ControlPath none
+  ConnectTimeout 120
+  RemoteCommand pkill x11vnc; x11vnc -display :0 -rfbport 5960 -unixsock $XDG_RUNTIME_DIR/x11vnc.%C.sock -nopw -localhost -repeat -timeout 10 -gone '/usr/bin/xautolock -locknow'
+
 ### DEFAULTS
 
 Match host *.madduck.net