Minor Caddyfile changes

Caddyfile

@@ -8,5 +8,17 @@ httptest.coldlightalchemist.com {
 }
 
 git.coldlightalchemist.com {
-	reverse_proxy 10.26.48.3:8081
+	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
 }

dmz-compose.yml

@@ -8,40 +8,31 @@ services:
     ports:
       - "80:80"
       - "443:443"
+      - "8443:8443"
     env_file: .caddy.env
     volumes:
       - "/root/infrastructure-compose/Caddyfile:/etc/caddy/Caddyfile"
       - "caddy_data:/data"
       - "caddy_config:/config"
-  velocity:
+#  velocity:
-    image: eclipse-temurin:21
+#    image: eclipse-temurin:21
-    restart: always
+#    restart: always
-    ports:
+#    ports:
-      - "25565:25565"
+#      - "25565:25565"
-      - "19131:19132/tcp"
+#      - "19131:19132/tcp"
-      - "19131:19132/udp"
+#      - "19131:19132/udp"
-    volumes:
+#    volumes:
-      - "/velocity:/mnt"
+#      - "/velocity:/mnt"
-    working_dir: "/mnt"
+#    working_dir: "/mnt"
-    command: ["java", "-Xms64m", "-Xmx1024m", "-jar", "/mnt/velocity.jar"]
+#    command: ["java", "-Xms64m", "-Xmx1024m", "-jar", "/mnt/velocity.jar"]
-  meshcentral:
+#  bedrockconnect:
-    image: typhonragewind/meshcentral:latest
+#    image: pugmatt/bedrock-connect:latest
-    restart: always
+#    restart: always
-    ports:
+#    ports:
-      - "8086:443"
+#      - "19132:19132/udp"
-    env_file: .meshcentral.env
+#    env_file: .bedrockconnect.env
-    volumes:
+#    volumes:
-      - "/meshcentral/data:/opt/meshcentral/meshcentral-data"
+#      - "/root/bedrockconnect:/mnt"
-      - "/meshcentral/user_files:/opt/meshcentral/meshcentral-files"
-      - "/backup/meshcentral:/opt/meshcentral/meshcentral-backups"
-  bedrockconnect:
-    image: pugmatt/bedrock-connect:latest
-    restart: always
-    ports:
-      - "19132:19132/udp"
-    env_file: .bedrockconnect.env
-    volumes:
-      - "/root/bedrockconnect:/mnt"
 volumes:
   caddy_data:
   caddy_config:

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: