set ncache=4 for x11vnc call

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 3a38cc8dbc771cc97d1a630b9f36d3fbf9e6e938..2a458ab17eefb6f0e8a5f3437872f1d73aa9f843 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -5,12 +5,8 @@ Host 127.0.0.1 | localhost
 
 ### VIRT
 
-Host albatross-win10.virt | win10
-  Hostname albatross-win10.virt
-  User martin
-
-Host albatross-tournamentsoftware.virt | ts
-  Hostname albatross-tournamentsoftware.virt
+Host tournamentsoftware.siby | ts
+  Hostname tournamentsoftware.siby
   User martin
 
 ### ECLIPSE KVM HOST
@@ -271,13 +267,6 @@ 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
   HostName lotus.fo.krafftwerk.de
   HostKeyAlias lotus
@@ -286,14 +275,6 @@ Host lotus.* | lotus
   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
-  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
   HostKeyAlias emerald
@@ -354,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 -ncache 4 -repeat -timeout 10 -gone '/usr/bin/xautolock -locknow'
+
 ### DEFAULTS
 
 Match host *.madduck.net