remove old fishbowl handling

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

diff --git a/.ssh/config.in b/.ssh/config.in
index 422118ecf3202ed57d23d8593477dbf96ee29185..2a458ab17eefb6f0e8a5f3437872f1d73aa9f843 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -178,14 +178,6 @@ 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
@@ -275,12 +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
-  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"
-  Tag vnc
-  LocalForward localhost:5960 localhost:5960
-
 Host lotus.* | lotus
   HostName lotus.fo.krafftwerk.de
   HostKeyAlias lotus
@@ -289,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
-  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'
-  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
   HostKeyAlias emerald
@@ -362,7 +340,7 @@ Host clegg.northdrive.de
 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'
+  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