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

diff --git a/.ssh/config.in b/.ssh/config.in
index 2f36e5b..422118e 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -5,12 +5,8 @@ Host 127.0.0.1 | localhost
 
 ### VIRT
 
-Host win10.virt | win10
-  Hostname win10.virt
-  User martin
-
-Host tournamentsoftware.virt | ts
-  Hostname tournamentsoftware.virt
+Host tournamentsoftware.siby | ts
+  Hostname tournamentsoftware.siby
   User martin
 
 ### ECLIPSE KVM HOST
@@ -182,6 +178,14 @@ Host albatross-luks
   AddressFamily inet
   User root
 
+Host albatross-vnc
+  HostName albatross.fo.krafftwerk.de
+  HostKeyAlias albatross.fo.krafftwerk.de
+  ForwardAgent yes
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
+  Tag vnc
+
 Host docker.fo.krafftwerk.de | dockerkr
   HostName docker.fo.krafftwerk.de
   HostKeyAlias docker.fo.krafftwerk.de
@@ -273,11 +277,9 @@ Host lotus.gern
 
 Host lotus.gern-vnc
   HostName lotus
-  ConnectTimeout 120
-  ControlPath none
   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'
+  Tag vnc
+  LocalForward localhost:5960 localhost:5960
 
 Host lotus.* | lotus
   HostName lotus.fo.krafftwerk.de
@@ -290,11 +292,10 @@ Host lotus.* | lotus
 Host lotus-vnc
   HostName lotus.fo.krafftwerk.de
   HostKeyAlias lotus
-  ControlPath none
-  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'
+  Tag vnc
   LocalForward localhost:5960 localhost:5960
+  #LocalForward localhost:5960 /run/user/1000/x11vnc.%C.sock
 
 Host emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no
@@ -356,6 +357,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