remove vnc stanzas as we can use -P

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

diff --git a/.ssh/config.in b/.ssh/config.in
index e0fcf1ea53d5a242a808b084e802edc2cb9a26b2..8f901d95bb5dc3f89c40f23c4e532802aaf4417d 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -5,12 +5,8 @@ Host 127.0.0.1 | localhost
 
 ### VIRT
 
 
 ### 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
   User martin
 
 ### ECLIPSE KVM HOST


@@ -160,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
 
   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
 Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern | 10.39.*.*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null


@@ -182,6 +182,12 @@ Host docker.fo.krafftwerk.de | dockerkr
   HostName docker.fo.krafftwerk.de
   HostKeyAlias docker.fo.krafftwerk.de
 
   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
 ### TONI
 
 Host gerald.toni.madduck.net | gerald.toni | gerald | gerald.int.toni.immo | martin.int.toni.immo


@@ -261,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
 
   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
 Host lotus.* | lotus
   HostName lotus.fo.krafftwerk.de
   HostKeyAlias lotus


@@ -276,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
 
   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
 Host emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no
   HostKeyAlias emerald


@@ -344,6 +335,13 @@ Host clegg.northdrive.de
   Port 37819
   User madduck
 
   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
 ### DEFAULTS
 
 Match host *.madduck.net