Add services and cleanup volumes

caddy/.gitignore

@@ -1 +1,2 @@
 /config/conf-hidden.d/
+/config/conf.d

caddy/Dockerfile

@@ -0,0 +1,8 @@
+FROM caddy:2-builder AS builder
+
+RUN xcaddy build \
+    --with github.com/caddy-dns/acmedns
+
+FROM caddy:2-alpine
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy/config/conf.002.d/matrix.msrg.cc.conf

@@ -3,11 +3,14 @@ matrix.msrg.cc {
 
 	reverse_proxy /_matrix/* synapse:8008
 	reverse_proxy /_synapse/* synapse:8008
+}
 
-	handle_path /admin/* {
-		rewrite * {path}
-		reverse_proxy synapse-admin:80
-	}
+admin.matrix.msrg.cc {
+	import default
+
+	reverse_proxy /_matrix/* synapse:8008
+	reverse_proxy /_synapse/* synapse:8008
+	reverse_proxy synapse-admin:80
 }
 
 msrg.cc:8008,

caddy/docker-compose.yml

@@ -2,7 +2,9 @@ version: "3.7"
 
 services:
   app:
-    image: caddy:2-alpine
+    build:
+      context: .
+    image: caddy-custom:2-alpine
     restart: always
     ports:
       - "80:80"