Minor Caddyfile changes

Caddyfile

@@ -0,0 +1,24 @@
+{
+	email {$ACME_EMAIL}
+	acme_dns cloudflare {$CLOUDFLARE_API_TOKEN}
+}
+
+httptest.coldlightalchemist.com {
+	respond "Hello World"
+}
+
+git.coldlightalchemist.com {
+	reverse_proxy 10.26.48.3:8084
+}
+
+notify.coldlightalchemist.com {
+	reverse_proxy 10.26.48.3:8082
+}
+
+nc.coldlightalchemist.com {
+	reverse_proxy 10.26.48.4:11000
+}
+
+recipes.coldlightalchemist.com:8443 {
+	reverse_proxy 10.26.48.3:8083
+}

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,33 +1,38 @@
 version: "3"
 
 services:
-  velocity:
+  caddy:
-    image: eclipse-temurin:21
+    build: "./builds/caddy/"
-    restart: always
+    container_name: caddy
+    restart: unless-stopped
     ports:
-      - "25565:25565"
+      - "80:80"
-      - "19131:19132/tcp"
+      - "443:443"
-      - "19131:19132/udp"
+      - "8443:8443"
+    env_file: .caddy.env
     volumes:
-      - "/velocity:/mnt"
+      - "/root/infrastructure-compose/Caddyfile:/etc/caddy/Caddyfile"
-    working_dir: "/mnt"
+      - "caddy_data:/data"
-    command: ["java", "-Xms64m", "-Xmx1024m", "-jar", "/mnt/velocity.jar"]
+      - "caddy_config:/config"
-  meshcentral:
+#  velocity:
-    image: typhonragewind/meshcentral:latest
+#    image: eclipse-temurin:21
-    restart: always
+#    restart: always
-    ports:
+#    ports:
-      - "8086:443"
+#      - "25565:25565"
-    env_file: .meshcentral.env
+#      - "19131:19132/tcp"
+#      - "19131:19132/udp"
+#    volumes:
+#      - "/velocity:/mnt"
+#    working_dir: "/mnt"
+#    command: ["java", "-Xms64m", "-Xmx1024m", "-jar", "/mnt/velocity.jar"]
+#  bedrockconnect:
+#    image: pugmatt/bedrock-connect:latest
+#    restart: always
+#    ports:
+#      - "19132:19132/udp"
+#    env_file: .bedrockconnect.env
+#    volumes:
+#      - "/root/bedrockconnect:/mnt"
 volumes:
-      - "/meshcentral/data:/opt/meshcentral/meshcentral-data"
+  caddy_data:
-      - "/meshcentral/user_files:/opt/meshcentral/meshcentral-files"
+  caddy_config:
-      - "/meshcentral_backups:/opt/meshcentral/meshcentral-backups"
-  bedrockconnect:
-    image: pugmatt/bedrock-connect
-    restart: always
-    ports:
-      - "19132:19132/udp"
-    env_file: .bedrockconnect.env
-    volumes:
-      - "/root/bedrockconnect:/mnt"
-

web-compose.yml

@@ -1,36 +1,6 @@
 version: "3"
 
 services:
-  httpdtest:
-    image: httpd:latest
-    container_name: http-test
-    restart: always
-    ports:
-      - "8080:80"
-    volumes:
-      - "/var/www/html:/usr/local/apache2/htdocs"
-  grocy:
-    image: lscr.io/linuxserver/grocy:latest
-    container_name: grocy
-    environment:
-      - PUID=10000
-      - PGID=10000
-      - TZ=America/New_York
-    volumes:
-      - /grocy:/config
-    ports:
-      - 9283:80
-  gitea:
-    image: gitea/gitea:1.25.3
-    container_name: gitea
-    env_file: .gitea.env
-    restart: always
-    ports:
-      - "8081:3000"
-    volumes:
-      - "/gitea:/data"
-      - "/etc/localtime:/etc/timezone:ro"
-      - "/etc/localtime:/etc/localtime:ro"
   web_recipes:
     restart: always
     image: vabene1111/recipes:tandoor-v1-20251212
@@ -63,5 +33,34 @@ services:
     ports:
       - "8082:80"
     restart: unless-stopped
+  gitea_db:
+    image: docker.io/library/mysql:8
+    container_name: gitea_db
+    restart: always
+    env_file: .gitea_new.env
+    ports:
+      - "3306:3306"
+    networks:
+      - gitea_network
+    volumes:
+      - "/gitea_new/mysql:/var/lib/mysql"
+  gitea_new:
+    image: docker.gitea.com/gitea:28.1.0
+    container_name: gitea_new
+    restart: always
+    env_file: .gitea_new.env
+    ports:
+      - "8084:3000"
+      - "2648:22"
+    volumes:
+      - "/gitea_new/data:/data"
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/timezone:/etc/localtime:ro"
+    networks:
+      - gitea_network
+    depends_on:
+      - gitea_db
 volumes:
   nginx_config:
+networks:
+  gitea_network: