Merge branch 'main' into add-collabora-transport

docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   traefik:
-    image: "traefik:v3.7@sha256:6d3e069ee484ab1da5adfdda555a75eb9b1545ef09096a0cc7c3043101986a20"
+    image: "traefik:v3.7@sha256:24841fe2de7304c149343d877d2923b4c8800a38ba015dea9174c23b20e344a0"
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
@@ -9,7 +9,7 @@ services:
     command:
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
-      - "--providers.docker.network=prod_shared-network"
+      - "--providers.docker.network=proxy"
       - "--providers.docker.constraints=Label(`env`, `${ENV}`)"
       - "--entryPoints.web.address=:80"
       - "--entryPoints.https.address=:443"
@@ -19,7 +19,8 @@ services:
       - "--certificatesresolvers.letsencrypt.acme.email=kovagoadi@gmail.com"
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
       - "--certificatesResolvers.letsencrypt.acme.caServer=${CERTBOT_CA_RESOLVER}"
-      # - "--providers.file.watch=true"
+      - "${TRAEFIK_LEGACY_OPT:-}"
+      - "--providers.file.watch=true"
       - "--accesslog"
       - "--log.level=INFO"
     # extra_hosts:
@@ -32,7 +33,7 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - "letsencrypt:/letsencrypt"
-      # - "./${ENV}:/etc/traefik"
+      - "./${ENV}:/etc/traefik"
 
   whoami:
     image: "traefik/whoami@sha256:c4717a8d1f0134a7444e24f881160e033991f23027c6c5a9a3f8fd22e70d1d44"

prod/collabora-transport.yaml

@@ -0,0 +1,4 @@
+http:
+  serversTransports:
+    collabora-transport:
+      insecureSkipVerify: true

prod/forward-to-legacy-nginx.yaml

@@ -31,7 +31,7 @@ http:
   routers:
     # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router)
     traefik-acme-handler:
-      rule: "PathPrefix(`/.well-known/acme-challenge/`)"
+      rule: "Host(`test-whoami.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)"
       entryPoints:
         - "web"
       service: "acme-http@internal" # This is the internal service name