From 2c92cb53424b36ba8e80333ad28ba5df0b600f03 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Thu, 31 Oct 2024 10:21:13 -0400
Subject: [PATCH] [ssh] Merge conflict resolved

---
 ssh/.ssh/config | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index c6b5ea8..e35dff7 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1,5 +1,6 @@
 Include ~/.orbstack/ssh/config
 
+
 Include /Users/powellc/.colima/ssh_config
 
 #CanonicalizeHostname yes
@@ -22,6 +23,9 @@ Host code.unbl.ink git.service 192.168.40.244
   PasswordAuthentication no
   IdentitiesOnly yes
 
+Host gogs*
+  Port 222
+
 # Mailinabox uses root by default
 Host box.unbl.ink
   IdentityFile ~/.ssh/box_unbl_ink
@@ -98,13 +102,13 @@ Host 67.205.184.201 life.unbl.ink
   IdentityFile ~/.ssh/1904_powellc
 
 ## Jail hosts all need a jump
-Match exec "onsubnet 192.168.40." host *.service
-  User root
+#Match exec "onsubnet 192.168.40." host *.service
+#  User root
   IdentityFile ~/.ssh/jails
   Hostname %h
 
-Match exec "onsubnet --not 192.168.40." host *.service
-  User root
-  IdentityFile ~/.ssh/jails
-  Hostname %h
-  ProxyJump bastion.unbl.ink
+  #Match exec "onsubnet --not 192.168.40." host *.service
+  #  User root
+  #  IdentityFile ~/.ssh/jails
+  #  Hostname %h
+  #  ProxyJump bastion.unbl.ink