Merge branch 'main' of https://git.coldlightalchemist.com/Bradley/infrastructure-compose

Caddyfile

@@ -0,0 +1,12 @@
+{
+	email {$ACME_EMAIL}
+	acme_dns cloudflare {$CLOUDFLARE_API_TOKEN}
+}
+
+httptest.coldlightalchemist.com {
+	respond "Hello World"
+}
+
+git.coldlightalchemist.com {
+	reverse_proxy 10.26.48.3:8081
+}

builds/caddy/Dockerfile

@@ -0,0 +1,7 @@
+FROM caddy:builder AS builder
+
+RUN caddy-builder github.com/caddy-dns/cloudflare
+
+FROM caddy:latest
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy

dmz-compose.yml

@@ -1,6 +1,18 @@
 version: "3"
 
 services:
+  caddy:
+    build: "./builds/caddy/"
+    container_name: caddy
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+    env_file: .caddy.env
+    volumes:
+      - "/root/infrastructure-compose/Caddyfile:/etc/caddy/Caddyfile"
+      - "caddy_data:/data"
+      - "caddy_config:/config"
   velocity:
     image: eclipse-temurin:21
     restart: always
@@ -21,13 +33,15 @@ services:
     volumes:
       - "/meshcentral/data:/opt/meshcentral/meshcentral-data"
       - "/meshcentral/user_files:/opt/meshcentral/meshcentral-files"
-      - "/meshcentral_backups:/opt/meshcentral/meshcentral-backups"
+      - "/backup/meshcentral:/opt/meshcentral/meshcentral-backups"
   bedrockconnect:
-    image: pugmatt/bedrock-connect
+    image: pugmatt/bedrock-connect:latest
     restart: always
     ports:
       - "19132:19132/udp"
     env_file: .bedrockconnect.env
     volumes:
       - "/root/bedrockconnect:/mnt"
-
+volumes:
+  caddy_data:
+  caddy_config: