Condense SSH config files

2 files changed, 10 insertions, 10 deletions

diff --git a/.ssh/home b/.ssh/home
index a2e61e2..5e79444 100644
--- a/.ssh/home
+++ b/.ssh/home
@@ -12,12 +12,20 @@ Host home.crute.me
     Hostname mcrute-virt.sea1.crute.me
     ProxyCommand ssh -F ~/.ssh/home -p 4321 -W %h:%p gateway-1.us-west-2.crute.me
 
+Host scp.home.crute.me
+    Hostname mcrute-virt.sea1.crute.me
+    ProxyCommand nc -x localhost:9999 %h %p
+
 Host tun.home.crute.me
     Hostname mcrute-virt.sea1.crute.me
     RequestTTY no
     ForwardX11 no
+    GatewayPorts yes
     Compression yes
     DynamicForward 9999
-    RemoteForward 1235 localhost:1235
-    RemoteForward 1425 localhost:1425
+    RemoteForward *:1235 localhost:1235
+    RemoteForward *:1425 localhost:1425
     ProxyCommand ssh -F ~/.ssh/home -p 4321 -W %h:%p gateway-1.us-west-2.crute.me
+
+Host *.crute.me
+    ProxyCommand nc -x localhost:9999 %h %p
diff --git a/.ssh/htun b/.ssh/htun
deleted file mode 100644
index 2a75e79..0000000
--- a/.ssh/htun
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim:set ft=sshconfig:
-
-GSSAPIAuthentication no
-UseRoaming no
-User mcrute
-IdentityAgent none
-IdentityFile ~/.ssh/id_ed25519.home
-ProxyCommand nc -x localhost:9999 %h %p