get rid of old stuff

app/docker-compose.prod.yml

@@ -4,7 +4,7 @@ services:
     container_name: bizmatch-app-prod  # Neu: Unterscheide Namen
     working_dir: /app
     volumes:
-      - ~/git/bizmatch-project-prod/bizmatch-server:/app  # Verwende Prod-Checkout
+      - /home/aknuth/git/bizmatch-project-prod/bizmatch-server:/app  # Verwende Prod-Checkout
     ports:
       - "3001:3000"  # Neu: Host-Port 3001, Container-Port bleibt 3000
     env_file:

caddy/Caddyfile

@@ -4,20 +4,6 @@
     acme_ca https://acme-v02.api.letsencrypt.org/directory
     debug
 }
-import email_autodiscover
-# ---------------------------------------------------------
-# Block A: Die dedizierten Autodiscover Domains
-# ---------------------------------------------------------
-autodiscover.bayarea-cc.com, autodiscover.bizmatch.net,
-autodiscover.ruehrgedoens.de, autoconfig.ruehrgedoens.de,
-autoconfig.bayarea-cc.com, autoconfig.bizmatch.net {
-    
-    # Hier rufen wir das Snippet auf
-    import email_settings
-    
-    # Fallback für Aufrufe auf Root dieser Subdomains
-    respond "Autodiscover Service Online" 200
-}
 
 # Prod: Neue Domains
 www.bizmatch.net {
@@ -25,13 +11,16 @@ www.bizmatch.net {
     root * /home/aknuth/git/bizmatch-project/bizmatch-server  # Prod-Ordner
     file_server
   }
-  #handle {
-  #  root * /home/aknuth/git/bizmatch-project-prod/bizmatch/dist/bizmatch/browser  # Neuer Prod-Dist-Ordner
-  #  try_files {path} {path}/ /index.html
-  #  file_server
-  #}
+  # Statische Dateien (CSS, JS, Bilder) – lange cachen, da sich der Name bei Änderungen ändert
+  header /assets/* Cache-Control "public, max-age=31536000, immutable"
+  header /*.css Cache-Control "public, max-age=31536000, immutable"
+  header /*.js Cache-Control "public, max-age=31536000, immutable"
+
+  # Die index.html und API-Antworten – NIEMALS cachen
+  header /index.html Cache-Control "no-cache, no-store, must-revalidate"  
+  
   handle {
-    reverse_proxy localhost:4200
+    reverse_proxy host.docker.internal:4200
   }
   log {
     output file /var/log/caddy/access.prod.log  # Separate Logs
@@ -40,7 +29,6 @@ www.bizmatch.net {
 }
 bizmatch.net {
   redir https://www.bizmatch.net{uri} permanent
-  import email_settings
 }
 www.qrmaster.net {
     handle {
@@ -55,110 +43,20 @@ www.qrmaster.net {
 qrmaster.net {
   redir https://www.qrmaster.net{uri} permanent
 }
-bayarea-cc.com {
-    # TLS-Direktive entfernen, falls Cloudflare die Verbindung terminiert
-    # tls {
-    #    dns cloudflare {env.CLOUDFLARE_API_TOKEN}
-    # }
-    
-    handle /api {
-        reverse_proxy host.docker.internal:3001
-    }
-    handle {
-        root * /app
-        try_files {path} /index.html
-        file_server
-    }
-    log {
-        output stderr
-        format console
-    }
-    encode gzip
-    import email_settings
-}
-www.bayarea-cc.com {
-    redir https://bayarea-cc.com{uri} permanent
-}
-setup.bayarea-cc.com {
-    # Wir setzen das Root-Verzeichnis auf den neuen Pfad im Container
-    root * /var/www/email-setup
-
-    # Webserver-Standardverhalten
-    file_server
-
-    # Wenn jemand nur die Domain aufruft, zeige setup.html
-    try_files {path} /setup.html
-}
-cielectrical.bayarea-cc.com {
-    # wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
-    handle {
-        reverse_proxy host.docker.internal:3000
-    }
-    log {
-        output file /var/log/caddy/cielectrical.log
-        format console
-    }
-    encode gzip
-}
-hamptonbrown.bayarea-cc.com {
-    # wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
+www.innungsapp.com {
     handle {
         reverse_proxy host.docker.internal:3010
     }
     log {
-        output file /var/log/caddy/hamptonbrown.log
+        output file /var/log/caddy/innungsapp.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
+innungsapp.com {
+  redir https://www.innungsapp.com{uri} permanent
 }
 
-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
-}
-fancytextstuff.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/fancytext.log
-        format console
-    }
-    encode gzip
-}	
-www.fancytextstuff.com {
-    redir https://fancytextstuff.com{uri} permanent
-}
 auth.bizmatch.net {
         reverse_proxy https://bizmatch-net.firebaseapp.com {
             header_up Host bizmatch-net.firebaseapp.com
@@ -171,31 +69,6 @@ gitea.bizmatch.net {
     reverse_proxy gitea:3500
 }
 
-dev.bizmatch.net {
-  handle /pictures/* {
-    root * /home/aknuth/git/bizmatch-project/bizmatch-server
-    file_server
-  }
-
-  handle {
-    root * /home/aknuth/git/bizmatch-project/bizmatch/dist/bizmatch/browser
-    try_files {path} {path}/ /index.html
-    file_server
-  }
-  
-  log {
-    output file /var/log/caddy/access.log {
-      roll_size 10MB
-      roll_keep 5
-      roll_keep_for 48h
-    }
-  }
-
-  encode gzip 
-
-}
-
-
 api.bizmatch.net {
   reverse_proxy host.docker.internal:3001 {  # Neu: Proxy auf Prod-Port 3001
     header_up X-Real-IP {http.request.header.CF-Connecting-IP}
@@ -204,82 +77,22 @@ api.bizmatch.net {
     header_up CF-IPCountry {http.request.header.CF-IPCountry}
   }
 }
-mailsync.bizmatch.net {
-  reverse_proxy host.docker.internal:5000 {
-    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}
-  }
-}
 
-# Roundcube für docker-mailserver
-app.email-bayarea.com {
-    reverse_proxy roundcube:80
+greenlenspro.com {
+  encode zstd gzip
 
-    log {
-        output stderr
-        format console
+  @storage path /storage /storage/*
+  handle @storage {
+    uri strip_prefix /storage
+    reverse_proxy minio:9000
   }
 
-    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
+  @api path /api /api/* /auth /auth/* /v1 /v1/* /health /plants /plants/*
+  handle @api {
+    reverse_proxy api:3000
   }
 
-    encode gzip
-}
-# Roundcube für docker-mailserver
-api.email-bayarea.com {
-    reverse_proxy host.docker.internal:3002
-    
-    log {
-        output stderr
-        format console
-    }
-    
-    encode gzip
-}
-annavillesda.org {
-  # API requests to backend
-  handle /api/* {
-    reverse_proxy host.docker.internal:3070
-  }
-  
-  # Frontend static files
   handle {
-    root * /home/aknuth/git/annaville-sda-site/dist
-    try_files {path} {path}/ /index.html
-    file_server
+    reverse_proxy landing:3000
   }
-  
-  log {
-    output file /var/log/caddy/access.prod.log
-  }
-  
-  encode gzip
-}
-www.annavillesda.org {
-    redir https://annavillesda.org{uri} permanent
-}
-# -----------------
-# just for certificate generation
-# -----------------
-mail.andreasknuth.de {
-    reverse_proxy nginx-mailcow:8080
-}
-web.email-bayarea.com {
-    reverse_proxy nginx-mailcow:8080
-}
-# Dieser Block dient nur dazu, das Zertifikat für den Mailserver zu beschaffen/erneuern.
-mail.email-srvr.com {
-    respond "Mailserver Certificate Authority is running." 200
 }

caddy/docker-compose.yml

@@ -16,6 +16,7 @@ services:
       - keycloak
       - gitea
       - mail_network
+      - greenlens_net
     volumes:
       - $PWD/Caddyfile:/etc/caddy/Caddyfile
       - $PWD/email_autodiscover:/etc/caddy/email_autodiscover
@@ -44,6 +45,8 @@ networks:
     external: true
   mail_network:
     external: true
+  greenlens_net:
+    external: true    
 
 volumes:
   caddy_data:

caddy/email-setup/autodiscover.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
+  <Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
+    <Account>
+      <AccountType>email</AccountType>
+      <Action>settings</Action>
+      <Protocol>
+        <Type>IMAP</Type>
+        <Server>mail.email-srvr.com</Server>
+        <Port>993</Port>
+        <DomainRequired>off</DomainRequired>
+        <LoginName></LoginName>
+        <SPA>off</SPA>
+        <SSL>on</SSL>
+        <AuthRequired>on</AuthRequired>
+      </Protocol>
+      <Protocol>
+        <Type>SMTP</Type>
+        <Server>mail.email-srvr.com</Server>
+        <Port>465</Port>
+        <DomainRequired>off</DomainRequired>
+        <LoginName></LoginName>
+        <SPA>off</SPA>
+        <SSL>on</SSL>
+        <AuthRequired>on</AuthRequired>
+      </Protocol>
+    </Account>
+  </Response>
+</Autodiscover>

gitea/docker-compose.yml

@@ -20,7 +20,7 @@ services:
     volumes:
       - gitea-data:/data
       #- ./gitea/gitea-ssh:/data/git/.ssh
-      - /home/git/.ssh/:/data/git/.ssh
+      #- /home/git/.ssh/:/data/git/.ssh
     ports:
       - "3500:3500"
       - "2222:22"