From cccd3c891ad24dcbc46f120b1814132af207ddf4 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Thu, 11 Jan 2024 16:48:14 -0500
Subject: [PATCH] [ssh] Cleaning up sshd a bit

---
 ssh/.ssh/config | 66 +++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 38 deletions(-)

diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 23bdee4..c902b8f 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1,25 +1,10 @@
+Include /Users/powellc/.colima/ssh_config
+
 #CanonicalizeHostname yes
-#CanonicalDomains elationemr.com internal.elationemr.com unbl.ink onec.me
+#CanonicalDomains elationemr.com unbl.ink onec.me
 #
 Host *
-    IdentitiesOnly=yes
-
-Host bastion.unbl.ink
-    Port 33
-    User powellc
-    IdentityFile ~/.ssh/jails
-	
-Host *.local
-    IdentityFile ~/.ssh/2022_h2_powellc
-    ServerAliveInterval 300
-    ServerAliveCountMax 2
-    AddKeysToAgent yes
-    VerifyHostKeyDNS no
-
-Host rss.lab.unbl.ink
-    Port 333
-    User powellc
-    IdentityFile ~/.ssh/2022_h2_powellc
+    IdentitiesOnly yes
 
 Host github.com
     ServerAliveInterval 300
@@ -44,11 +29,6 @@ Host box.unbl.ink
   IdentityFile ~/.ssh/box_unbl_ink
   User root
 
-Host box.castine.town
-  IdentityFile ~/.ssh/box_castine_town
-  User root
-
-
 Host akna.local
   User pi
 
@@ -69,13 +49,6 @@ Host tilde.club
   User secstate
   IdentityFile ~/.ssh/powellc
 
-Host bastion*
-  Port 33
-  User powellc
-
-Host snap2*.local
-  User powellc
-
 # ChicagoVPS
 Host pandora.unbl.ink bt2.unbl.ink
   IdentityFile ~/.ssh/pandora
@@ -86,21 +59,38 @@ Host *.local *.service
   StrictHostKeyChecking no
 
 # LibreELEC
-Host ymir.local gerd.local skoll.local
+Host ymir.local gerd.local skoll.local thrymr.local
   User root
 
 # Bare metal hosts
-Host hati.local aegir.local tarqeq.local daphnis.local loge.local hyperion.local dione.local phoebe.local iapetus.local titan.local paaliaq.local kiviuq.local kari.local atlas.local siarnaq.local skathi.local tarvos.local rhea.local
+Host hati.local aegir.local tarqeq.local daphnis.local loge.local hyperion.local dione.local phoebe.local iapetus.local titan.local paaliaq.local kiviuq.local kari.local siarnaq.local skathi.local tarvos.local rhea.local
   User powellc
-  IdentitiesOnly yes
 
-# PBP uses root user
-Host penobscotbaypress.com
+# Root hosts
+Host penobscotbaypress.com atlas.local
   User root
 
+
+#####
+## This does the heavy lifting with homelab negotiation
+#####
+
 Host bastion.unbl.ink
-  Port 33
-  IdentityFile ~/.ssh/2022_h2_powellc
+    Port 33
+    User powellc
+    IdentityFile ~/.ssh/2022_h2_powellc
+
+Host rss.lab.unbl.ink
+    Port 333
+    User powellc
+    IdentityFile ~/.ssh/2022_h2_powellc
+
+Host *.local
+    IdentityFile ~/.ssh/2022_h2_powellc
+    ServerAliveInterval 300
+    ServerAliveCountMax 2
+    AddKeysToAgent yes
+    VerifyHostKeyDNS no
 
 ## Jail hosts all need a jump
 Host *.local 192.168.40.* *.service