From 1878383b9cceef2c8260c0b4769704eca6afef01 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 6 Mar 2023 16:48:45 +0100 Subject: [PATCH 01/16] improved known_hosts completion --- .zsh/zshrc/parts.d/50-ssh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.zsh/zshrc/parts.d/50-ssh b/.zsh/zshrc/parts.d/50-ssh index c734343..04b9358 100644 --- a/.zsh/zshrc/parts.d/50-ssh +++ b/.zsh/zshrc/parts.d/50-ssh @@ -11,8 +11,15 @@ # populate hosts completion with SSH's known_hosts if [ -r $HOME/.ssh/known_hosts ]; then local _myhosts - _myhosts=(${${${${(f)"$(cat $HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*}) - zstyle ':completion:*' hosts $_myhosts + _myhosts=$(while read host rest; do + host="${(f)host%%,*}" + case "$host" in + ([[:alnum:]]*) echo "$host";; + (\[[[:alnum:]]*) echo "${${host#\[}%\]*}";; + esac + done < ~/.ssh/known_hosts) + #_myhosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*}) + #zstyle ':completion:*' hosts $_myhosts unset _myhosts fi -- 2.39.2 From b42eedbb088107e30d19555fd52571ec4a4885ef Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 29 Mar 2023 10:14:59 +0200 Subject: [PATCH 02/16] new github fingerprint --- .ssh/known_hosts.d/github.com | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ssh/known_hosts.d/github.com b/.ssh/known_hosts.d/github.com index de142d2..dc3f1d4 100644 --- a/.ssh/known_hosts.d/github.com +++ b/.ssh/known_hosts.d/github.com @@ -1 +1,2 @@ -github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== +github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl + -- 2.39.2 From c5b376136d7fd90f43bb8ca6d602850305221aed Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 29 Mar 2023 10:17:40 +0200 Subject: [PATCH 03/16] add brick hostkey --- .ssh/known_hosts.d/lehel.madduck.net | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ssh/known_hosts.d/lehel.madduck.net b/.ssh/known_hosts.d/lehel.madduck.net index a94daa1..6db2832 100644 --- a/.ssh/known_hosts.d/lehel.madduck.net +++ b/.ssh/known_hosts.d/lehel.madduck.net @@ -5,4 +5,8 @@ albatross.lehel.madduck.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0sytIkvpfOIxK albatross.lehel.madduck.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBUm7dZQ/yWq6dA2TRp0ajJyTl5/k9LlsyR7s++x6BQPOsUrTCIzV5eJKCjKf6UGS2tM2CYCYKGZLIt8f4tivDg= albatross.lehel.madduck.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBA6FlFGWubHAriC7NIQUbmDqxmO9Vq0CLBAwqeI6jZh +brick.lehel.madduck.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7o+YQBQvqWULK6ZjgxscJw2x/PAODovrk9Pd926zuYGN2LsljnxDKiU+duSLF1wVdx+JOuMYsQ0i28iWlMC+Ym6Zik3IdVoRu1Nx5/6DvlCRgoeq1XCu8Sl4MAt2ZDmIe14sq70OW5623Pnv8wZqoDgFoXCQ6TWEqo+uxQuYI5A0pEggtTKRU/7x2Eb8/r43RgwrseC2jIJfFtWTU6Zl7PKBSNa0CYoOUcO4ENp5jDzN+FANEUGAp54ZEbO/1sXJ0KV9KKcjSlTtdW1w9R6EFENPcZHnzgmpwyN5AacYW+LTny+ww1O+bNHhFyevmmUo4ev/MbExb72yFvGoUU7x4LrFXqlwH83utWgHkWO0gX+KdK0AhJn93ZCxOqqTo3PuZJbP/z/TDsOSlBiz/hbajHdMgvfYCAriQU7pQkOKDXSRKjVfGseupRJZMLble8S4Vy/pZsqQ4tP/EE36gIrPgh6kedRFnrGfBsppZh7ZYpTG2xUYbkK4FzZJUpRPZ0Bc= +brick.lehel.madduck.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBgXVIOMB55mAsVy6TZQuNLgSy+ITup5C5hXKRjQpwbsmytaxW6BGxveMXux4uhoOb16SbCqZ/IirG9bGOzXTR4= +brick.lehel.madduck.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG2IHflfQcphXVnGlwv/udwMXIC3/dvHcqKJJewwTyio + bike.lehel ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPf6AWoWyZna13DpftFwaH3FTtVMRirB4O5y25uj656Mw43ikCd9qaTPZa38SHesFDHonesF08p09dRfsDVL7j8= -- 2.39.2 From 2138841924bdd5572b2b332b06e2b0f94fdb18e5 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 29 Mar 2023 13:45:22 +0200 Subject: [PATCH 04/16] add lotus WOL proxy --- .ssh/config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ssh/config.in b/.ssh/config.in index f288d18..6bf6118 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -194,6 +194,8 @@ Host lotus.* Host lotus | lotus.rw.madduck.net CheckHostIP no HostKeyAlias lotus + ConnectTimeout 120 + ProxyCommand ssh wall.gern.madduck.net "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && sleep 10 && exec nc -w 30 %h %p" #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 -- 2.39.2 From 0d66892df02897bcdc0750edd6754a0815f23415 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 10 Jul 2023 15:31:56 +0200 Subject: [PATCH 05/16] bike direct connect --- .ssh/config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config.in b/.ssh/config.in index 6bf6118..b170563 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -150,7 +150,7 @@ Host albatross-via-clegg | ralbatross DynamicForward localhost:9049 Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm - Hostname bike.lehel.vpn.madduck.net + Hostname bike.lehel.madduck.net HostKeyAlias bike.lehel Host visitor*.lehel.madduck.net | visitor*.lehel -- 2.39.2 From 150617f01a5c3190b1a1ebdade5fe45fd6602c0c Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 10 Jul 2023 15:32:18 +0200 Subject: [PATCH 06/16] lotus wakeonlan proxy --- .ssh/config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config.in b/.ssh/config.in index b170563..6c33ac4 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -195,7 +195,7 @@ Host lotus | lotus.rw.madduck.net CheckHostIP no HostKeyAlias lotus ConnectTimeout 120 - ProxyCommand ssh wall.gern.madduck.net "wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04 && sleep 10 && exec nc -w 30 %h %p" + 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" #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 -- 2.39.2 From ed65649762101400dbf53d8ac46a7785a0854f95 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 10 Jul 2023 15:32:31 +0200 Subject: [PATCH 07/16] use hostkeyalias for control path --- .ssh/config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config.in b/.ssh/config.in index 6c33ac4..7359294 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -278,7 +278,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 -- 2.39.2 From e53078a2ee4f97198f144d71e82b744c30307d39 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 10 Jul 2023 15:35:07 +0200 Subject: [PATCH 08/16] make wakeonlan specific to gern --- .ssh/config.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index 7359294..3a2c973 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -186,18 +186,15 @@ Host visitor*.gern.madduck.net | visitor*.gern ### 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 - 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" - #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 -- 2.39.2 From 062dfb7a6d10009aa8b56f26cc5d8e449eacefcc Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 23 Jul 2023 12:44:57 +0200 Subject: [PATCH 09/16] remove sgs7e key --- .ssh/authorized_keys.d/ed25519@sgs7e | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .ssh/authorized_keys.d/ed25519@sgs7e diff --git a/.ssh/authorized_keys.d/ed25519@sgs7e b/.ssh/authorized_keys.d/ed25519@sgs7e deleted file mode 100644 index bed1416..0000000 --- a/.ssh/authorized_keys.d/ed25519@sgs7e +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXDATeim5+0qp/6t76Q4UWBFPQUAYvOK1fNR9XFzmMo sgs7e -- 2.39.2 From b06928a47427983ea72e59c3f8667853819a38a7 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 5 Aug 2023 06:37:06 +1200 Subject: [PATCH 10/16] add dynamic port forward to nz host @catalyst --- .ssh/config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/config.in b/.ssh/config.in index 3a2c973..4a6f6cc 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -236,6 +236,7 @@ Host tilde.club Host nz Hostname 202.78.240.196 User madduck + DynamicForward localhost:9064 Host github.com | github Hostname github.com -- 2.39.2 From 6a540a1b021efcb315371b858c3707f522167faf Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 5 Aug 2023 06:38:45 +1200 Subject: [PATCH 11/16] add gerald.toni --- .gitignore.d/ssh | 10 +++------- .ssh/config.in | 6 ++++++ .ssh/known_hosts.d/toni.madduck.net | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .ssh/known_hosts.d/toni.madduck.net diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh index 95afde9..89e091f 100644 --- a/.gitignore.d/ssh +++ b/.gitignore.d/ssh @@ -7,27 +7,23 @@ !/.gitignore.d/ssh !/.ssh/authorized_keys.d/ed25519@albatross !/.ssh/authorized_keys.d/ed25519@lotus -!/.ssh/authorized_keys.d/ed25519@sgs7e !/.ssh/authorized_keys.d/openpgp@smartcard !/.ssh/config.in !/.ssh/.gitignore -!/.ssh/known_hosts.d/debconf.org !/.ssh/known_hosts.d/debian.org +!/.ssh/known_hosts.d/gern.madduck.net !/.ssh/known_hosts.d/github.com !/.ssh/known_hosts.d/gitlab.com !/.ssh/known_hosts.d/lehel.madduck.net !/.ssh/known_hosts.d/madduck.net !/.ssh/known_hosts.d/mjollnir.org !/.ssh/known_hosts.d/mtfk.de -!/.ssh/known_hosts.d/mtvic.madduck.net !/.ssh/known_hosts.d/northfiles.de -!/.ssh/known_hosts.d/oneplus5t -!/.ssh/known_hosts.d/sgs5m -!/.ssh/known_hosts.d/sgs7e +!/.ssh/known_hosts.d/rw.madduck.net !/.ssh/known_hosts.d/tilde-club +!/.ssh/known_hosts.d/toni.madduck.net !/.ssh/known_hosts.d/viinet.de !/.ssh/Makefile !/.ssh/rc !/.var/ssh/.gitignore -!/.xsession.d/20-ssh-ask-passphrase !/.zsh/zshrc/parts.d/50-ssh diff --git a/.ssh/config.in b/.ssh/config.in index 4a6f6cc..8ed27f9 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -184,6 +184,12 @@ Host visitor*.gern.madduck.net | visitor*.gern StrictHostKeyChecking no UserKnownHostsFile /dev/null +### TONI + +Host gerald.toni.madduck.net | gerald.toni | gerald + Hostname gerald.toni.madduck.net + HostKeyAlias gerald.toni.madduck.net + ### ROAD WARRIORS Host lotus.gern diff --git a/.ssh/known_hosts.d/toni.madduck.net b/.ssh/known_hosts.d/toni.madduck.net new file mode 100644 index 0000000..c07e612 --- /dev/null +++ b/.ssh/known_hosts.d/toni.madduck.net @@ -0,0 +1 @@ +gerald.toni.madduck.net,192.168.231.158,10.14.17.27 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPPL2uMB1WneHc/ajH/n9bjdrxu/KA8Jb3QJsNsLtch -- 2.39.2 From 7df908ce5b1e060a27b9bf577a80e8cb98cd269f Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 27 Sep 2023 23:41:07 +0200 Subject: [PATCH 12/16] add toni hosts --- .gitignore.d/ssh | 1 + .ssh/config.in | 44 ++++++++++++++++++++++++++++++++++-- .ssh/known_hosts.d/toni.immo | 10 ++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 .ssh/known_hosts.d/toni.immo diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh index 89e091f..97c8dda 100644 --- a/.gitignore.d/ssh +++ b/.gitignore.d/ssh @@ -21,6 +21,7 @@ !/.ssh/known_hosts.d/northfiles.de !/.ssh/known_hosts.d/rw.madduck.net !/.ssh/known_hosts.d/tilde-club +!/.ssh/known_hosts.d/toni.immo !/.ssh/known_hosts.d/toni.madduck.net !/.ssh/known_hosts.d/viinet.de !/.ssh/Makefile diff --git a/.ssh/config.in b/.ssh/config.in index 8ed27f9..e641478 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -186,10 +186,50 @@ Host visitor*.gern.madduck.net | visitor*.gern ### TONI -Host gerald.toni.madduck.net | gerald.toni | gerald - Hostname gerald.toni.madduck.net +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 pve-backups.toni.immo | pve-backups + Hostname pve-backups.toni.immo + HostKeyAlias pve-backups.toni.immo + ### ROAD WARRIORS Host lotus.gern diff --git a/.ssh/known_hosts.d/toni.immo b/.ssh/known_hosts.d/toni.immo new file mode 100644 index 0000000..04a1212 --- /dev/null +++ b/.ssh/known_hosts.d/toni.immo @@ -0,0 +1,10 @@ +authentik.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPPL2uMB1WneHc/ajH/n9bjdrxu/KA8Jb3QJsNsLtch +postgres.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBF2pEexCS4Qy0s0Zt22qF349GAVF11iywsZ/6+oCjW1 +pve.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJcSNQoOxftkcUsGTKlGAtGVlLWcOpy4xHVhPHeect4 +wikijs.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL/NeXD7Dxe3LNCYSFztCssJCXAGQb9RPmtaBNKo7E9p +nginx.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID+pC3pUlHZzhmpi73A1lE/qyo8qIP5uFNZuPOlCfHJa +docspell.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICN5YAjHxuv5OEsWWAbeBXky7nv80NB6E1wtw9uX5LwY +dc01.samba-ad.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPPL2uMB1WneHc/ajH/n9bjdrxu/KA8Jb3QJsNsLtch +fileserver.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKT1LBhFy3RPChiODn5AIIAd5CrH00nrXaNNkVieBs8F +dovecot.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBMWmzdb3+PBpvjAPjS5OyY+uJoCPdme0ixyTSx1HXS +[pve-backups.toni.immo]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs -- 2.39.2 From 00e5635ff041b865fe343b674438bd2fe60f96b0 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 10 Nov 2023 18:17:04 +0100 Subject: [PATCH 13/16] move albatross from lehel to toni, temp for now --- .ssh/config.in | 42 ++++++++-------------------- .ssh/known_hosts.d/lehel.madduck.net | 12 -------- .ssh/known_hosts.d/toni.madduck.net | 3 ++ 3 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 .ssh/known_hosts.d/lehel.madduck.net diff --git a/.ssh/config.in b/.ssh/config.in index e641478..e04bdc8 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.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 @@ -186,6 +155,17 @@ Host visitor*.gern.madduck.net | visitor*.gern ### 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 diff --git a/.ssh/known_hosts.d/lehel.madduck.net b/.ssh/known_hosts.d/lehel.madduck.net deleted file mode 100644 index 6db2832..0000000 --- a/.ssh/known_hosts.d/lehel.madduck.net +++ /dev/null @@ -1,12 +0,0 @@ -clegg.lehel.madduck.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3rqCQ/65ZlNkBz7sIXHqSgN3zqsjvdU+UVzCVSbicxfWbAln9FQQjer4cwSfQUh9qYQhkl3+N/jSS8LYJxXosDXQ/1/jfKl5zKi0slBmH7lzxc+y8G6CarSSsNtNOvuG3e4f37XTE++7+7SvIx4fgwJDAvNxvPtUNXj+71fIuCG1/YfLdWb0zagTo4ubuK09gfTPhbwlfSK4WZRZlgSpXtwGLtgC1f6Ed7dNTI33e+EKT2oPSqwTJIWtNfOW5dZ0Es4abOnhWOhfyqKD8nk5imQY7ZbYYdhO0FPK+5rHPSdlD8i/YZEWHGJn5Z2O0uiOm9n2X/THbET+6RjfIS1ef -clegg.lehel.madduck.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJcP9obkfcIGs+sS/O4hkIp3qowa16cfnb69wM8Ejal1l0rdFJREZDcS2nvs5jX/l/n5ZKE6mBIONfL5gXnY3NM= -clegg.lehel.madduck.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPqqvPivHff0iDtRqfdL7HrCJw7OH+NL2JhLRyaBLRd -albatross.lehel.madduck.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0sytIkvpfOIxK9ZLVoDYusSMkiwzxhA2eWGqzksHvRdcx9LuEKk21LEKdCRB8lChYoyYXzxrYqYMifaW1dRRc/s+9DCAFLGnaF7WQBdYDIJgs7kXiXDn3v44DqgTK6RiMhBxYqbBCkXkphFqSTJv+4eIc9OAgW0YLYKvz+Yx2hz5OraQy4VbDVkLM2/vhBl8KaUPTQTbOgAHtWCBFw2BsWgYU9rTfuZ5uvZGnN5tu8WcpHqweWdKXe3McrYQ1BNnXtqEEJR5QWJySqGxPi8awpk52Ln4JYBrh2M0sGVIHiT/qKwCLSTYUqP/5T+BXKb98EuSNr7hOgRrj+uRPqeyJ -albatross.lehel.madduck.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBUm7dZQ/yWq6dA2TRp0ajJyTl5/k9LlsyR7s++x6BQPOsUrTCIzV5eJKCjKf6UGS2tM2CYCYKGZLIt8f4tivDg= -albatross.lehel.madduck.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBA6FlFGWubHAriC7NIQUbmDqxmO9Vq0CLBAwqeI6jZh - -brick.lehel.madduck.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7o+YQBQvqWULK6ZjgxscJw2x/PAODovrk9Pd926zuYGN2LsljnxDKiU+duSLF1wVdx+JOuMYsQ0i28iWlMC+Ym6Zik3IdVoRu1Nx5/6DvlCRgoeq1XCu8Sl4MAt2ZDmIe14sq70OW5623Pnv8wZqoDgFoXCQ6TWEqo+uxQuYI5A0pEggtTKRU/7x2Eb8/r43RgwrseC2jIJfFtWTU6Zl7PKBSNa0CYoOUcO4ENp5jDzN+FANEUGAp54ZEbO/1sXJ0KV9KKcjSlTtdW1w9R6EFENPcZHnzgmpwyN5AacYW+LTny+ww1O+bNHhFyevmmUo4ev/MbExb72yFvGoUU7x4LrFXqlwH83utWgHkWO0gX+KdK0AhJn93ZCxOqqTo3PuZJbP/z/TDsOSlBiz/hbajHdMgvfYCAriQU7pQkOKDXSRKjVfGseupRJZMLble8S4Vy/pZsqQ4tP/EE36gIrPgh6kedRFnrGfBsppZh7ZYpTG2xUYbkK4FzZJUpRPZ0Bc= -brick.lehel.madduck.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBgXVIOMB55mAsVy6TZQuNLgSy+ITup5C5hXKRjQpwbsmytaxW6BGxveMXux4uhoOb16SbCqZ/IirG9bGOzXTR4= -brick.lehel.madduck.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG2IHflfQcphXVnGlwv/udwMXIC3/dvHcqKJJewwTyio - -bike.lehel ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPf6AWoWyZna13DpftFwaH3FTtVMRirB4O5y25uj656Mw43ikCd9qaTPZa38SHesFDHonesF08p09dRfsDVL7j8= diff --git a/.ssh/known_hosts.d/toni.madduck.net b/.ssh/known_hosts.d/toni.madduck.net index c07e612..574a1d3 100644 --- a/.ssh/known_hosts.d/toni.madduck.net +++ b/.ssh/known_hosts.d/toni.madduck.net @@ -1 +1,4 @@ gerald.toni.madduck.net,192.168.231.158,10.14.17.27 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPPL2uMB1WneHc/ajH/n9bjdrxu/KA8Jb3QJsNsLtch +albatross ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0sytIkvpfOIxK9ZLVoDYusSMkiwzxhA2eWGqzksHvRdcx9LuEKk21LEKdCRB8lChYoyYXzxrYqYMifaW1dRRc/s+9DCAFLGnaF7WQBdYDIJgs7kXiXDn3v44DqgTK6RiMhBxYqbBCkXkphFqSTJv+4eIc9OAgW0YLYKvz+Yx2hz5OraQy4VbDVkLM2/vhBl8KaUPTQTbOgAHtWCBFw2BsWgYU9rTfuZ5uvZGnN5tu8WcpHqweWdKXe3McrYQ1BNnXtqEEJR5QWJySqGxPi8awpk52Ln4JYBrh2M0sGVIHiT/qKwCLSTYUqP/5T+BXKb98EuSNr7hOgRrj+uRPqeyJ +albatross ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBUm7dZQ/yWq6dA2TRp0ajJyTl5/k9LlsyR7s++x6BQPOsUrTCIzV5eJKCjKf6UGS2tM2CYCYKGZLIt8f4tivDg= +albatross ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBA6FlFGWubHAriC7NIQUbmDqxmO9Vq0CLBAwqeI6jZh -- 2.39.2 From cf12a7c77af1b3448b6daf6f9d4526d0736053d6 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 10 Nov 2023 18:17:15 +0100 Subject: [PATCH 14/16] toni backupserver --- .ssh/config.in | 4 ++++ .ssh/known_hosts.d/toni.immo | 1 + 2 files changed, 5 insertions(+) diff --git a/.ssh/config.in b/.ssh/config.in index e04bdc8..83db29a 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -206,6 +206,10 @@ 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 pve-backups.toni.immo | pve-backups Hostname pve-backups.toni.immo HostKeyAlias pve-backups.toni.immo diff --git a/.ssh/known_hosts.d/toni.immo b/.ssh/known_hosts.d/toni.immo index 04a1212..c3ca64d 100644 --- a/.ssh/known_hosts.d/toni.immo +++ b/.ssh/known_hosts.d/toni.immo @@ -8,3 +8,4 @@ dc01.samba-ad.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPPL2uMB1WneHc/ajH/ fileserver.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKT1LBhFy3RPChiODn5AIIAd5CrH00nrXaNNkVieBs8F dovecot.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBMWmzdb3+PBpvjAPjS5OyY+uJoCPdme0ixyTSx1HXS [pve-backups.toni.immo]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs +backupserver.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4ZI7DzK7xRUHF9N1bPik2WuJLrX/aFHAGlKGZVRjOG -- 2.39.2 From 95a24eda273496f5b5ea99000181c82db4ab861f Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 10 Nov 2023 18:17:20 +0100 Subject: [PATCH 15/16] add hetzner port --- .ssh/config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ssh/config.in b/.ssh/config.in index 83db29a..690515c 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -213,6 +213,8 @@ Host backupserver.int.toni.immo | backupserver Host pve-backups.toni.immo | pve-backups Hostname pve-backups.toni.immo HostKeyAlias pve-backups.toni.immo + Port 23 + User u368088 ### ROAD WARRIORS -- 2.39.2 From c93af455b8afccc2803c0a22d6cfe0fbd6e67665 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 27 Jan 2024 10:36:46 +0100 Subject: [PATCH 16/16] add cups/checkmk for toni --- .ssh/config.in | 8 ++++++++ .ssh/known_hosts.d/toni.immo | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.ssh/config.in b/.ssh/config.in index 690515c..599f923 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -210,6 +210,14 @@ 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 diff --git a/.ssh/known_hosts.d/toni.immo b/.ssh/known_hosts.d/toni.immo index c3ca64d..279c04d 100644 --- a/.ssh/known_hosts.d/toni.immo +++ b/.ssh/known_hosts.d/toni.immo @@ -9,3 +9,5 @@ fileserver.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKT1LBhFy3RPChiODn5 dovecot.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBMWmzdb3+PBpvjAPjS5OyY+uJoCPdme0ixyTSx1HXS [pve-backups.toni.immo]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs backupserver.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4ZI7DzK7xRUHF9N1bPik2WuJLrX/aFHAGlKGZVRjOG +cups.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBMWmzdb3+PBpvjAPjS5OyY+uJoCPdme0ixyTSx1HXS +checkmk.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIM5fCksu/QBzxAlpsmd4bzH7YlUMKsih6Ly1IvZcmgS -- 2.39.2