From 1515293bf8bc2b6a33a3e5f7f9a2994defae2aa9 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Fri, 11 Nov 2022 14:18:41 -0700
Subject: [PATCH] Also do SSH

---
 homelab/docker-compose.yaml  | 5 ++++-
 melville/Caddyfile           | 2 +-
 melville/docker-compose.yaml | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/homelab/docker-compose.yaml b/homelab/docker-compose.yaml
index e9cbe5a..ab21919 100644
--- a/homelab/docker-compose.yaml
+++ b/homelab/docker-compose.yaml
@@ -6,8 +6,11 @@ services:
     entrypoint:
       - /usr/bin/ssh
       - -N
-      - -R :5800:caddy:80
+      - -R :5880:caddy:80
+      - -R :5822:host.docker.internal:22
       - core@melville.woozle.org
+    extra_hosts:
+      - host.docker.internal:host-gateway
     secrets:
       - source: tunnel
         target: /config/.ssh/id_rsa
diff --git a/melville/Caddyfile b/melville/Caddyfile
index 529fdb5..52ac534 100644
--- a/melville/Caddyfile
+++ b/melville/Caddyfile
@@ -14,7 +14,7 @@ vail.woozle.org {
 }
 
 deergrove.woozle.org, git.woozle.org, ancestry.woozle.org, drive.woozle.org {
-  reverse_proxy host.docker.internal:5800
+  reverse_proxy host.docker.internal:5880
 }
 
 www.woozle.org, woozle.org {
diff --git a/melville/docker-compose.yaml b/melville/docker-compose.yaml
index d77e661..adac217 100644
--- a/melville/docker-compose.yaml
+++ b/melville/docker-compose.yaml
@@ -29,4 +29,4 @@ services:
 configs:
   Caddyfile:
     file: Caddyfile
-    name: Caddyfile-v6
+    name: Caddyfile-v7