]> git.madduck.net Git - etc/ssh.git/blobdiff - .ssh/config.in

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

remove vnc stanzas as we can use -P
[etc/ssh.git] / .ssh / config.in
index 686d16184e8beb298ab87fa1a63ca8f44111aa14..8f901d95bb5dc3f89c40f23c4e532802aaf4417d 100644 (file)
@@ -267,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
@@ -281,19 +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
-
-Match tagged vnc
-  ControlPath none
-  ConnectTimeout 120
-  RemoteCommand pkill x11vnc; x11vnc -display :0 -rfbport 5960 -unixsock $XDG_RUNTIME_DIR/x11vnc.%C.sock -nopw -localhost -norepeat -timeout 10 -gone '/usr/bin/xautolock -locknow'
-
 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 -repeat -timeout 10 -gone '/usr/bin/xautolock -locknow'
+
 ### DEFAULTS
 
 Match host *.madduck.net