From 66373126718846571b5e9d8e092c9945a0f4af60 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Sun, 26 Apr 2020 08:08:19 +1200
Subject: [PATCH 1/1] remove fishbowl auth key

---
 .gitignore.d/ssh                        |  1 -
 .ssh/authorized_keys.d/ed25519@fishbowl |  1 -
 .ssh/config.in                          | 15 +++------------
 .ssh/known_hosts.d/madduck.net          |  1 -
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 .ssh/authorized_keys.d/ed25519@fishbowl

diff --git a/.gitignore.d/ssh b/.gitignore.d/ssh
index 05142ef..c034947 100644
--- a/.gitignore.d/ssh
+++ b/.gitignore.d/ssh
@@ -6,7 +6,6 @@
 !/.config/vcsh/hooks-enabled/ssh.post-run
 !/.gitignore.d/ssh
 !/.ssh/authorized_keys.d/ed25519@albatross
-!/.ssh/authorized_keys.d/ed25519@fishbowl
 !/.ssh/authorized_keys.d/ed25519@lotus
 !/.ssh/authorized_keys.d/ed25519@sgs7e
 !/.ssh/authorized_keys.d/openpgp@smartcard
diff --git a/.ssh/authorized_keys.d/ed25519@fishbowl b/.ssh/authorized_keys.d/ed25519@fishbowl
deleted file mode 100644
index dc3a7ed..0000000
--- a/.ssh/authorized_keys.d/ed25519@fishbowl
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOUyt2rgldAH7ryG3Yi3kTu/6/gPTD57V2S73nC6NTkJ madduck@fishbowl
diff --git a/.ssh/config.in b/.ssh/config.in
index 18af8a2..550d969 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -143,6 +143,7 @@ Host albatross-via-clegg | ralbatross
 Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
   Hostname bike.lehel.madduck.net
   HostKeyAlias bike.lehel
+  ProxyJump albatross.lehel.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -198,21 +199,11 @@ Host visitor*.mtvic.madduck.net | visitor*.mtvic
 ### CATALYST
 
 Host atom.catalyst.madduck.net | atom.catalyst | atom
-  Hostname atom.catalyst.madduck.net
+  Hostname 192.168.19.1
+  ProxyJump domine.madduck.net
 
 ### ROAD WARRIORS
 
-Host fishbowl.*
-  CheckHostIP no
-  HostKeyAlias fishbowl
-  LocalForward localhost:8386 localhost:8384
-
-Host fishbowl | fishbowl.rw.madduck.net
-  CheckHostIP no
-  HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,gauting,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 -vq0 \${TARGETS%%%%,*} %p"
-  LocalForward localhost:8386 localhost:8384
-
 Host lotus.*
   CheckHostIP no
   HostKeyAlias lotus
diff --git a/.ssh/known_hosts.d/madduck.net b/.ssh/known_hosts.d/madduck.net
index 5c42d35..ff7a54f 100644
--- a/.ssh/known_hosts.d/madduck.net
+++ b/.ssh/known_hosts.d/madduck.net
@@ -20,5 +20,4 @@ gig.madduck.net,130.60.75.241,2001:470:b46d::1 ecdsa-sha2-nistp256 AAAAE2VjZHNhL
 domine.madduck.net,185.212.47.185 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIG4ZuK73Qgy+Sr10oWG9zgaN6tbiLKzpzXQjSyLLt3PgHI2uPQrZvdEfqTbkyyuEbQ20A4U10S1FctAtODKraY=
 
 # road warriors
-fishbowl ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPFsyNLDNKBl5m9QfJg2dKCwr5fgDhXe7rdKcBeqHyWdZCUztTsuTNWFXEed3h9YnVdUn6AYwijxEsVVKbr2mFDOZ+j7kHN1nxM9T2NvKWksQ43yghMqK9ndTZqpMqObZbyIcO5FTo64wnDfsuuIHZpsYYoVPSMAJH9VaI8xXNQfXhpiJWYKw4DLAWD3Ycz0LjWsTl+91kL26oQd9yl2pkn+7h37Ry1rUNh0iXM6GG7DM263ut3C83gDjZZx+0TeHYstDaf1x5sM/vPRdOp9lofQmtlluE2areuH75yV5zu2RyTXMJs7OA18XbG6kBFrUMNmRW8SkpiWGKDHqayB3D
 lotus ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKQqekPYpk6sryPF9TOyhLjO2R7kO0Hfn62mjVDFlHbMjbhHUsfVqvfNkrAhqgX/YaavePC1+RRFX6xNs470jCE=
-- 
2.39.5