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

diff --git a/.ssh/config.in b/.ssh/config.in
index f288d18..599f923 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -126,37 +126,6 @@ Host piper.madduck.net | piper
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.madduck.net
 
-### LEHEL
-
-Host clegg.lehel.madduck.net | clegg.lehel | clegg
-  CheckHostIP no
-  Hostname clegg.lehel.madduck.net
-
-Host albatross.lehel.madduck.net | albatross.lehel | albatross
-  Hostname albatross.lehel.madduck.net
-  HostKeyAlias albatross.lehel
-  LocalForward localhost:8387 localhost:8384
-  DynamicForward localhost:9049
-Host albatross-luks
-  Hostname albatross.lehel.madduck.net
-  AddressFamily inet
-  User root
-
-Host albatross-via-clegg | ralbatross
-  Hostname albatross.lehel.madduck.net
-  ProxyJump clegg.dyndns.madduck.net
-  AddressFamily inet
-  LocalForward localhost:8387 localhost:8384
-  DynamicForward localhost:9049
-
-Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
-  Hostname bike.lehel.vpn.madduck.net
-  HostKeyAlias bike.lehel
-
-Host visitor*.lehel.madduck.net | visitor*.lehel
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
 ### GERN
 
 Host wall.gern.madduck.net | wall.gern | wall
@@ -184,18 +153,88 @@ Host visitor*.gern.madduck.net | visitor*.gern
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
+### TONI
+
+Host albatross
+  Hostname 192.168.235.107
+  HostKeyAlias albatross
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
+Host albatross-luks
+  Hostname 192.168.235.107
+  HostKeyAlias albatross
+  AddressFamily inet
+  User root
+
+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
+
+Host dc01.samba-ad.toni.immo | dc01
+  Hostname dc01.samba-ad.toni.immo
+  HostKeyAlias dc01.samba-ad.toni.immo
+
+Host pve.int.toni.immo | pve
+  Hostname pve.int.toni.immo
+  HostKeyAlias pve.int.toni.immo
+
+Host fileserver.int.toni.immo | fileserver
+  Hostname fileserver.int.toni.immo
+  HostKeyAlias fileserver.int.toni.immo
+
+Host postgres.int.toni.immo | postgres
+  Hostname postgres.int.toni.immo
+  HostKeyAlias postgres.int.toni.immo
+
+Host wikijs.int.toni.immo | wikijs
+  Hostname wikijs.int.toni.immo
+  HostKeyAlias wikijs.int.toni.immo
+
+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 docspell.int.toni.immo | docspell
+  Hostname docspell.int.toni.immo
+  HostKeyAlias docspell.int.toni.immo
+
+Host dovecot.int.toni.immo | dovecot
+  Hostname dovecot.int.toni.immo
+  HostKeyAlias dovecot.int.toni.immo
+
+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.*
-  CheckHostIP no
+Host lotus.gern
   HostKeyAlias 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
 
-Host lotus | lotus.rw.madduck.net
+Host lotus.* | lotus
   CheckHostIP no
   HostKeyAlias lotus
-  #ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -F -vq0 \${TARGETS%%%%,*} %p"
-  #ProxyUseFdpass yes
   LocalForward localhost:8385 localhost:8384
 
 Host ini | ini.dyndns.madduck.net
@@ -237,6 +276,7 @@ Host tilde.club
 Host nz
   Hostname 202.78.240.196
   User madduck
+  DynamicForward localhost:9064
 
 Host github.com | github
   Hostname github.com
@@ -276,7 +316,7 @@ Match host *.debian.org
 Host *
   IgnoreUnknown *
   ConnectTimeout 30
-  ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
+  ControlPath ~/.var/ssh/ssh_control_%l_%k_%p_%r
   ControlMaster auto
   ControlPersist 30
   ExitOnForwardFailure no