Merge branch 'master' of git.bizmatch.net:aknuth/docker

caddy/Caddyfile

@@ -7,7 +7,7 @@
 # Prod: Neue Domains
 www.bizmatch.net {
   handle /pictures/* {
-    root * /home/aknuth/git/bizmatch-project-prod/bizmatch-server  # Prod-Ordner
+    root * /home/aknuth/git/bizmatch-project/bizmatch-server  # Prod-Ordner
     file_server
   }
   handle {
@@ -23,6 +23,19 @@ www.bizmatch.net {
 bizmatch.net {
   redir https://www.bizmatch.net{uri} permanent
 }
+www.qrmaster.net {
+    handle {
+        reverse_proxy host.docker.internal:3050
+    }
+    log {
+        output file /var/log/caddy/qrmaster.log
+        format console
+    }
+    encode gzip
+}
+qrmaster.net {
+  redir https://www.qrmaster.net{uri} permanent
+}
 bayarea-cc.com {
     # TLS-Direktive entfernen, falls Cloudflare die Verbindung terminiert
     # tls {
@@ -164,14 +177,6 @@ dev.bizmatch.net {
 
 }
 
-# api-dev.bizmatch.net {
-#   reverse_proxy host.docker.internal:3000 {
-#     header_up X-Real-IP {http.request.header.CF-Connecting-IP}
-#     header_up X-Forwarded-For {http.request.header.CF-Connecting-IP}
-#     header_up X-Forwarded-Proto {http.request.header.X-Forwarded-Proto}
-#     header_up CF-IPCountry {http.request.header.CF-IPCountry}
-#   }
-# }
 
 api.bizmatch.net {
   reverse_proxy host.docker.internal:3001 {  # Neu: Proxy auf Prod-Port 3001
@@ -201,7 +206,30 @@ app.email-bayarea.com {
     
     encode gzip
 }
+# Roundcube für docker-mailserver
+config.email-bayarea.com {
 
+    root * /home/aknuth/git/config-email/frontend/dist
+    try_files {path} {path}/ /index.html
+    file_server
+
+    log {
+        output file /var/log/caddy/config-email.log
+    }
+
+    encode gzip
+}
+# Roundcube für docker-mailserver
+api.email-bayarea.com {
+    reverse_proxy host.docker.internal:3002
+    
+    log {
+        output stderr
+        format console
+    }
+    
+    encode gzip
+}
 # IMAP/SMTP Server für E-Mail-Clients
 email-srvr.com {
     # Für E-Mail-Client-Konfiguration (Autodiscover)

caddy/docker-compose.yml

@@ -26,6 +26,7 @@ services:
       - /home/aknuth/git/annaville-sda-site/dist:/home/aknuth/git/annaville-sda-site/dist:ro  # ← DAS FEHLT!
       - /home/aknuth/git/bay-area-affiliates/dist/bay-area-affiliates/browser:/app
       - /home/aknuth/log/caddy:/var/log/caddy
+      - /home/aknuth/git/config-email/frontend/dist:/home/aknuth/git/config-email/frontend/dist:ro
     environment:
       - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN}
       - CLOUDFLARE_EMAIL=${CLOUDFLARE_EMAIL}