X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/cf12a7c77af1b3448b6daf6f9d4526d0736053d6..2555490d1d9349e3b19f653ac5d6148ac32f98aa:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index 83db29a..3f735ac 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -149,26 +149,30 @@ Host echo.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
   Hostname echo.kids.gern.madduck.net
   HostKeyAlias echo.kids.gern.madduck.net
 
-Host visitor*.gern.madduck.net | visitor*.gern
+Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern | 10.39.*.*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-### TONI
+### KRAFFTWERK
 
-Host albatross
-  Hostname 192.168.235.107
-  HostKeyAlias albatross
+Host albatross.fo.krafftwerk.de | albatross
+  HostName albatross.fo.krafftwerk.de
+  HostKeyAlias albatross.fo.krafftwerk.de
+  ForwardAgent yes
   LocalForward localhost:8387 localhost:8384
   DynamicForward localhost:9049
 Host albatross-luks
-  Hostname 192.168.235.107
-  HostKeyAlias albatross
+  HostName albatross.fo.krafftwerk.de
+  HostKeyAlias albatross.fo.krafftwerk.de
   AddressFamily inet
   User root
 
+### TONI
+
 Host gerald.toni.madduck.net | gerald.toni | gerald | gerald.int.toni.immo | martin.int.toni.immo
   Hostname gerald.int.toni.immo
   HostKeyAlias gerald.toni.madduck.net
+  ForwardAgent yes
 
 Host dc01.samba-ad.toni.immo | dc01
   Hostname dc01.samba-ad.toni.immo
@@ -194,14 +198,19 @@ Host nginx.int.toni.immo | nginx | git.int.toni.immo
   Hostname nginx.int.toni.immo
   HostKeyAlias nginx.int.toni.immo
 
-Host authentik.int.toni.immo | authentik
-  Hostname authentik.int.toni.immo
-  HostKeyAlias authentik.int.toni.immo
+Host docker.int.toni.immo | docker
+  Hostname docker.int.toni.immo
+  HostKeyAlias docker.int.toni.immo
 
 Host docspell.int.toni.immo | docspell
   Hostname docspell.int.toni.immo
   HostKeyAlias docspell.int.toni.immo
 
+Host paperless.int.toni.immo | paperless
+  Hostname paperless.int.toni.immo
+  HostKeyAlias paperless.int.toni.immo
+  ForwardAgent yes
+
 Host dovecot.int.toni.immo | dovecot
   Hostname dovecot.int.toni.immo
   HostKeyAlias dovecot.int.toni.immo
@@ -210,29 +219,49 @@ Host backupserver.int.toni.immo | backupserver
   Hostname backupserver.int.toni.immo
   HostKeyAlias backupserver.int.toni.immo
 
+Host cups.int.toni.immo | cups
+  Hostname cups.int.toni.immo
+  HostKeyAlias cups.int.toni.immo
+
+Host checkmk.int.toni.immo | checkmk
+  Hostname checkmk.int.toni.immo
+  HostKeyAlias checkmk.int.toni.immo
+
 Host pve-backups.toni.immo | pve-backups
   Hostname pve-backups.toni.immo
   HostKeyAlias pve-backups.toni.immo
+  Port 23
+  User u368088
 
 ### ROAD WARRIORS
 
 Host lotus.gern
-  HostKeyAlias lotus
+  HostName lotus
   ConnectTimeout 120
+  ForwardAgent yes
   ProxyCommand ssh wall.gern.madduck.net "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; 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 "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; 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
   CheckHostIP no
   HostKeyAlias lotus
+  ForwardAgent yes
+  HostName lotus.fo.krafftwerk.de
   LocalForward localhost:8385 localhost:8384
 
-Host ini | ini.dyndns.madduck.net
-  CheckHostIP no
-  HostKeyAlias ini.dyndns.madduck.net
-  HostName ini.dyndns.madduck.net
-  Port 13579
-  User christine
+Host lotus-vnc
+  HostName lotus.fo.krafftwerk.de
+  HostKeyAlias lotus
+  ConnectTimeout 120
+  LocalForward localhost:5960 localhost:5900
+  RemoteCommand pkill x11vnc; x11vnc -display :0 -nopw -localhost -norepeat -gone '/usr/bin/xautolock -locknow'
 
 Host emerald | emerald.kids.gern | emerald.rw.madduck.net
   CheckHostIP no