From 906998015aceadcac3f68a7493180065e024eb15 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Tue, 25 Jul 2023 10:56:26 -0500
Subject: [PATCH] drop caddy to it's own container/repo

---
 caddy/Caddyfile    |  7 -------
 docker-compose.yml | 30 +++++++++++-------------------
 2 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 caddy/Caddyfile

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
deleted file mode 100644
index e31ffd4..0000000
--- a/caddy/Caddyfile
+++ /dev/null
@@ -1,7 +0,0 @@
-git.dayl.in {
-	reverse_proxy 127.0.0.1:3000
-}
-
-f1.dayl.in {
-  reverse_proxy 127.0.0.1:8000
-}
diff --git a/docker-compose.yml b/docker-compose.yml
index a72e47a..956dc09 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,30 +14,22 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "127.0.0.1:3000:3000"
-      - "127.0.0.0:222:22"
-      - "127.0.0.1:2222:22"
-
-  caddy:
-    image: caddy:2.5.2-alpine
-    restart: unless-stopped
-    container_name: caddy
-    volumes:
-      - ./caddy/Caddyfile:/etc/caddy/Caddyfile
-      - caddy_data:/data
-      - caddy_config:/config
-    network_mode: host
+      - "2222:22"
+    networks:
+      - caddy
 
   soft-serve:
-    image: charmcli/soft-serve:v0.4.4
-    restart: unless-stopped
-    container_name: soft-serve
+    image: charmcli/soft-serve:v0.5.2
     volumes:
       - ./soft/data:/soft-serve
     ports:
       - 23231:23231
+      - 23232:23232
+      - 23233:23233
+      - 9418:9418
+    restart: unless-stopped
 
-volumes:
-  caddy_data:
+networks:
+  caddy:
     external: true
-  caddy_config:
+