From c93af455b8afccc2803c0a22d6cfe0fbd6e67665 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 27 Jan 2024 10:36:46 +0100 Subject: [PATCH 1/9] 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 From 6ed079929bafa943d23325e04afbfb359f6ef7b0 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 23 May 2024 13:42:08 +0200 Subject: [PATCH 2/9] visitor.gern now dyn.* --- .ssh/config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config.in b/.ssh/config.in index 599f923..d50fdcb 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -149,7 +149,7 @@ 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 -- 2.39.2 From c64814999563426db25ec3650a196181d2d0e1f8 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 23 May 2024 13:43:01 +0200 Subject: [PATCH 3/9] move albatross to krafftwerk domain --- .ssh/config.in | 14 ++++++++------ .ssh/known_hosts.d/fo.krafftwerk.de | 3 +++ .ssh/known_hosts.d/toni.madduck.net | 4 +--- 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 .ssh/known_hosts.d/fo.krafftwerk.de diff --git a/.ssh/config.in b/.ssh/config.in index d50fdcb..ab20508 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -153,19 +153,21 @@ Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern | StrictHostKeyChecking no UserKnownHostsFile /dev/null -### TONI +### KRAFFTWERK -Host albatross - Hostname 192.168.235.107 - HostKeyAlias albatross +Host albatross.toni.madduck.net | albatross + HostName albatross.fo.krafftwerk.de + HostKeyAlias albatross.fo.krafftwerk.de 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 diff --git a/.ssh/known_hosts.d/fo.krafftwerk.de b/.ssh/known_hosts.d/fo.krafftwerk.de new file mode 100644 index 0000000..1ebbf25 --- /dev/null +++ b/.ssh/known_hosts.d/fo.krafftwerk.de @@ -0,0 +1,3 @@ +albatross.fo.krafftwerk.de,192.168.235.110 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCX9H14+Y2QOn5L76xSYsG+0sEUYaUnM1N6FXxoXnyIZAD0CZ8hPwWOvxKbYWS8HbGVsVKFng7gBJ98SzfTAsbygyPbqq33sAdat7ctSRiXXclOYbcZGqet7axAi/bJhIjvegeUh+2a90cDQUJRusrjzAghChAv5Y11wblQVODxnQmsgFnSfRctB7AcT5ITpnWaafqAx8fVuuGFhOKgwsyUx+x41JmTyJPBcEAbRWcb1cyyRLOmwOE4+/l1X3atk4J/m0pM1e9KPh4BPnmANSvqdJwdTneTMdkZWFuDwfGEsFiO7iPWmL06n4AH2JKIHSYeiHQORxKC0A27eKZe5Gdp +albatross.fo.krafftwerk.de,192.168.235.110 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL/0qHLZuoFtMhEHk0dmirxuyWLRuff2k3nrMW7ppwfK9Vrw6YqawBkBh4QJMMPwY1y287/tVSLFy+IE5Fk060U= +albatross.fo.krafftwerk.de,192.168.235.110 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGbo/v9gWLLARK9SIg9NmfYCkjTGZPOXNaXgtKFOPa7R diff --git a/.ssh/known_hosts.d/toni.madduck.net b/.ssh/known_hosts.d/toni.madduck.net index 574a1d3..cc05315 100644 --- a/.ssh/known_hosts.d/toni.madduck.net +++ b/.ssh/known_hosts.d/toni.madduck.net @@ -1,4 +1,2 @@ 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 6447379b7377f2c037e9e9369662b663416d167c Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 23 May 2024 13:43:31 +0200 Subject: [PATCH 4/9] move authentik to docker --- .ssh/config.in | 6 +++--- .ssh/known_hosts.d/toni.immo | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index ab20508..de832bf 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -196,9 +196,9 @@ 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 diff --git a/.ssh/known_hosts.d/toni.immo b/.ssh/known_hosts.d/toni.immo index 279c04d..e9ad38a 100644 --- a/.ssh/known_hosts.d/toni.immo +++ b/.ssh/known_hosts.d/toni.immo @@ -1,4 +1,4 @@ -authentik.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPPL2uMB1WneHc/ajH/n9bjdrxu/KA8Jb3QJsNsLtch +docker.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 -- 2.39.2 From cf127cff37f35e35ffa5c50bdd5eee4ccf1298a5 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 23 May 2024 13:43:37 +0200 Subject: [PATCH 5/9] remove ini --- .ssh/config.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.ssh/config.in b/.ssh/config.in index de832bf..091f468 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -239,13 +239,6 @@ Host lotus.* | lotus HostKeyAlias lotus 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 emerald | emerald.kids.gern | emerald.rw.madduck.net CheckHostIP no HostKeyAlias emerald -- 2.39.2 From c00e46840e60b230c4b0575d1cc44533fbd01cc0 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 23 May 2024 13:43:46 +0200 Subject: [PATCH 6/9] add toni paperless host --- .ssh/config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ssh/config.in b/.ssh/config.in index 091f468..735f908 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -204,6 +204,10 @@ 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 + Host dovecot.int.toni.immo | dovecot Hostname dovecot.int.toni.immo HostKeyAlias dovecot.int.toni.immo -- 2.39.2 From 5c03d78b4bc54d0f483b23963bbcbcc291c92884 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 23 May 2024 13:45:23 +0200 Subject: [PATCH 7/9] lotus vnc stanzas --- .ssh/config.in | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.ssh/config.in b/.ssh/config.in index 735f908..0078a9b 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -233,16 +233,33 @@ Host pve-backups.toni.immo | pve-backups ### 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 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 HostKeyAlias emerald -- 2.39.2 From 2555490d1d9349e3b19f653ac5d6148ac32f98aa Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 29 May 2024 09:08:51 +0200 Subject: [PATCH 8/9] forward agent to albatross and paperless --- .ssh/config.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.ssh/config.in b/.ssh/config.in index 0078a9b..3f735ac 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -155,9 +155,10 @@ Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern | ### KRAFFTWERK -Host albatross.toni.madduck.net | 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 @@ -171,6 +172,7 @@ Host albatross-luks 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 @@ -207,6 +209,7 @@ Host docspell.int.toni.immo | docspell 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 -- 2.39.2 From 446f4834ce441a330b0bc8571e80d8e3e1da83b4 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 29 May 2024 09:08:56 +0200 Subject: [PATCH 9/9] add paperless hostkey --- .ssh/known_hosts.d/toni.immo | 1 + 1 file changed, 1 insertion(+) diff --git a/.ssh/known_hosts.d/toni.immo b/.ssh/known_hosts.d/toni.immo index e9ad38a..fa9aebc 100644 --- a/.ssh/known_hosts.d/toni.immo +++ b/.ssh/known_hosts.d/toni.immo @@ -11,3 +11,4 @@ dovecot.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBMWmzdb3+PBpvjAPjS5O 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 +paperless.int.toni.immo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEBMWmzdb3+PBpvjAPjS5OyY+uJoCPdme0ixyTSx1HXS -- 2.39.2