From 32f00d6785828fb07b2ef5a399ecb871ff688a01 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Sat, 3 Jan 2026 12:32:33 -0500
Subject: [PATCH] [ssh] Resolve conflicts

---
 bash/.aliases   |  2 ++
 ssh/.ssh/config | 22 +++++++---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/bash/.aliases b/bash/.aliases
index f0a37ae..8809169 100644
--- a/bash/.aliases
+++ b/bash/.aliases
@@ -32,3 +32,5 @@ alias tok="docker compose run --rm --no-deps django ./manage.py gen_jwt data/dev
 alias pre="test && cov && lint"
 alias sdkfix="ruff format . && ruff check --fix ."
 alias mmlocalbuild="poetry run pip install --extra-index-url https://us-central1-python.pkg.dev/mmllc-dev/python/simple/ -r dev-requirements.txt"
+alias sweep_movies="sudo find /tank/videos/incoming -type f \( -iname '*.mp4' -o -iname '*.mkv' \) ! -iname '*sample*' -exec mv {} /tank/videos/movies/ \;"
+alias clear_incoming="sudo find /tank/videos/incoming -type d -maxdepth 1 -mindepth 1 ! -name '.stfolder' -exec rm -rf {} +"
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 6e6f8fc..53648e5 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -94,22 +94,14 @@ Host bastion.service
     Port 33
 
 ## Jail hosts all need a jump
-Match exec "onsubnet 192.168.40." host *.service
+#Match exec "onsubnet 192.168.40." host *.service
+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
-
-  
-Host mmpay-bastion.mmstage.dev
-  ForwardAgent yes
-  Hostname mmpay-bastion.mmstage.dev
-  ProxyCommand /opt/homebrew/bin/cloudflared  access ssh --hostname %h
-
-Host devstage-mmpay-0*
-  ProxyJump mmpay-bastion.mmstage.dev
+#Match exec "onsubnet --not 192.168.40." host *.service
+#  User root
+#  IdentityFile ~/.ssh/jails
+#  Hostname %h
+#  ProxyJump bastion.unbl.ink