EMAIL-CC

Caddyfile

@@ -2,8 +2,17 @@
     email {env.CLOUDFLARE_EMAIL}
     acme_dns cloudflare {env.CLOUDFLARE_API_TOKEN}
     acme_ca https://acme-v02.api.letsencrypt.org/directory
-    debug
 }
+:80 {
+    respond "Caddy alive on new Contabo — migration in progress" 200
+}
+
+git.bizmatch.net {
+    handle {
+        reverse_proxy gitea:3500
+    }
+}
+
 ##############
 ##### BIZMATCH
 ##############
@@ -13,7 +22,7 @@ www.bizmatch.net, bizmatch.net {
         root * /home/aknuth/git/bizmatch-project/bizmatch-server
         file_server
     }
-    
+
     handle {
         reverse_proxy bizmatch-ssr:4000
     }
@@ -30,80 +39,28 @@ auth.bizmatch.net {
             header_up X-Real-IP {remote_host}
         }
 }
-gitea.bizmatch.net {
-    reverse_proxy gitea:3500
-}
 
-
-##############
-##### QRMASTER
-##############
-www.qrmaster.net, qrmaster.net {
-    handle {
-        reverse_proxy qrmaster-web:3000
-    }
-}
 ##############
 ##### INNUNGSAPP
 ##############
-www.innungsapp.com, innungsapp.com {
+*.innungsapp.com, innungsapp.com {
+    # Nutzt die oben definierte Cloudflare DNS-Challenge
+    tls {
+        dns cloudflare {env.CLOUDFLARE_API_TOKEN}
+    }
+
     handle {
         reverse_proxy innungsapp-admin:3000
     }
+
     log {
         output file /var/log/caddy/innungsapp.log
         format console
     }
+
     encode gzip
 }
-##############
-##### BAYAREA
-##############
-bayarea-cc.com {
-    # 1. API Requests -> NestJS Backend auf Port 3073
-    handle /api/* {
-        reverse_proxy host.docker.internal:3073
-    }
 
-    # 2. Frontend Requests -> Angular Nginx auf Port 3072
-    handle {
-        reverse_proxy host.docker.internal:3072
-    }
-    
-    log {
-        output file /var/log/caddy/bayarea.access.log
-    }
-    encode gzip zstd
-}
-
-www.bayarea-cc.com {
-    redir https://bayarea-cc.com{uri} permanent
-}
-
-##############
-##### ANNAVILLE
-##############
-annavillesda.org {
-  # API requests to backend
-  handle /api/* {
-    reverse_proxy host.docker.internal:3070
-  }
-  
-  # Frontend requests to Nginx container
-  handle {
-    reverse_proxy host.docker.internal:3071
-  }
-  
-  log {
-    output file /var/log/caddy/annaville.access.log
-  }
-  
-  encode gzip
-}
-
-www.annavillesda.org {
-    redir https://annavillesda.org{uri} permanent
-}
 ##############
 ##### GREENLENS
 ##############
@@ -125,6 +82,30 @@ greenlenspro.com {
     reverse_proxy landing:3000
   }
 }
+
+##############
+##### QRMASTER
+##############
+www.qrmaster.net, qrmaster.net {
+    handle {
+        reverse_proxy qrmaster-web:3000
+    }
+}
+
+##############
+##### EMAIL-CC
+##############
+www.email-cc.com, email-cc.com {
+    handle {
+        reverse_proxy email-cc-web:3000
+    }
+    log {
+        output file /var/log/caddy/email-cc.log
+        format console
+    }
+    encode gzip zstd    
+}
+
 ############################
 ##### config.email-bayarea.com
 ############################
@@ -148,6 +129,52 @@ config.email-bayarea.com {
     }
     encode gzip zstd
 }
+
+##############
+##### ANNAVILLE
+##############
+annavillesda.org {
+  # API requests to backend
+  handle /api/* {
+    reverse_proxy host.docker.internal:3070
+  }
+
+  # Frontend requests to Nginx container
+  handle {
+    reverse_proxy host.docker.internal:3071
+  }
+
+  log {
+    output file /var/log/caddy/annaville.access.log
+  }
+
+  encode gzip
+}
+
+www.annavillesda.org {
+    redir https://annavillesda.org{uri} permanent
+}
+
+##############
+##### BAYAREA
+##############
+bayarea-cc.com {
+
+    # 2. Frontend Requests
+    handle {
+        reverse_proxy host.docker.internal:8080
+    }
+
+    log {
+        output file /var/log/caddy/bayarea.access.log
+    }
+    encode gzip zstd
+}
+
+www.bayarea-cc.com {
+    redir https://bayarea-cc.com{uri} permanent
+}
+
 ##############
 ##### POCS
 ##############
@@ -162,39 +189,7 @@ cielectrical.bayarea-cc.com {
     }
     encode gzip zstd
 }
-hamptonbrown.bayarea-cc.com {
+
-    # wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
-    handle {
-        reverse_proxy host.docker.internal:3010
-    }
-    log {
-        output file /var/log/caddy/hamptonbrown.log
-        format console
-    }
-    encode gzip
-}
-nqsltd.bayarea-cc.com {
-    # wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
-    handle {
-        reverse_proxy host.docker.internal:3020
-    }
-    log {
-        output file /var/log/caddy/nqsltd.log
-        format console
-    }
-    encode gzip
-}
-gregknoppcpa.bayarea-cc.com {
-    # wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
-    handle {
-        reverse_proxy host.docker.internal:3030
-    }
-    log {
-        output file /var/log/caddy/gregknoppcpa.log
-        format console
-    }
-    encode gzip
-}
 buddelectric.bayarea-cc.com {
     handle {
         # NEU: Direkter Proxy zum Container auf dem nativen Next.js Port
@@ -206,14 +201,3 @@ buddelectric.bayarea-cc.com {
     }
     encode gzip zstd
 }
-iitwelders.bayarea-cc.com {
-    # wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
-    handle {
-        reverse_proxy host.docker.internal:8080
-    }
-    log {
-        output file /var/log/caddy/iitwelders.log
-        format console
-    }
-    encode gzip
-}

docker-compose.yml

@@ -15,7 +15,9 @@ services:
       - bizmatch
       - gitea
       - greenlens_net
-      - qr-master_qrmaster-network
+      - qrmaster-network
+      - innungsapp
+      - email-cc  
     volumes:
       - $PWD/Caddyfile:/etc/caddy/Caddyfile
       - ./caddy_data:/data
@@ -37,6 +39,10 @@ networks:
     external: true
   greenlens_net:
     external: true    
-  qr-master_qrmaster-network:
+  qrmaster-network:
     external: true    
+  innungsapp:               # NEU
+    external: true    
+  email-cc:
+    name: email-cc