From 9aaca98af684c1dda532a7ac40c8e3d1d1b540e3 Mon Sep 17 00:00:00 2001
From: holzi1005 <andreas.holzmann@h2-invent.com>
Date: Tue, 11 Feb 2025 18:46:07 +0100
Subject: [PATCH] fix traefik

---
 .docker-compose.https.yml | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/.docker-compose.https.yml b/.docker-compose.https.yml
index 021ae23..691eb64 100644
--- a/.docker-compose.https.yml
+++ b/.docker-compose.https.yml
@@ -1,43 +1,23 @@
 services:
   traefik-ja:
     image: "traefik:v2.5"
-    env_file:
-      - ./.env
-      - ./.env.local
-      - ./.env.custom
+
     command:
-      #- "--log.level=DEBUG"
-      - "--api.insecure=false"
+      - "--log.level=DEBUG"
+      - "--api.insecure=true"
       - "--providers.docker=true"
-      #- "--api.dashboard=true"
-
       - "--providers.docker.exposedbydefault=false"
-
       - "--entrypoints.unsecure.address=:80"
+      # Global HTTPS
       - "--entrypoints.web.address=:443"
-      # Global HTTP -> HTTPS
       - "--entrypoints.unsecure.http.redirections.entryPoint.to=web"
       - "--entrypoints.unsecure.http.redirections.entryPoint.scheme=https"
       # SSL configuration
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=unsecure"
-      - "--certificatesresolvers.letsencrypt.acme.email=webmaster@jitsi-admin-master.de"
+      - "--certificatesresolvers.letsencrypt.acme.email=webmaster@odc-master.de"
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
 
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)"
-      - "traefik.http.routers.http-catchall.entrypoints=unsecure"
-      - "traefik.http.routers.http-catchall.middlewares=redirect-to-https@docker"
-      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
-
-      - "traefik.http.routers.traefik-ja.rule=Host(`traefik.${PUBLIC_URL}`)"
-      - "traefik.http.routers.traefik-ja.entrypoints=web"
-      - "traefik.http.routers.traefik-ja.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.traefik-ja.service=api@internal"
-      - "traefik.http.routers.traefik-ja.middlewares=traefik-auth"
-      - "traefik.http.middlewares.traefik-auth.basicauth.users=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/" # test:test
-
     networks:
       - external
     restart: unless-stopped
@@ -68,7 +48,7 @@ services:
 
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.websocket-ja.rule=Host(`${PUBLIC_URL}`) && PathPrefix(`/ws`)"
+      - "traefik.http.routers.websocket-ja.rule=Host(`<clientUrl>`) && PathPrefix(`/ws`)"
       - "traefik.http.routers.websocket-ja.entrypoints=web"
       - "traefik.http.routers.websocket-ja.tls=true"
       - "traefik.http.services.websocket-ja.loadbalancer.server.port=3000"
@@ -104,7 +84,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.app-ja.tls=true"
-      - "traefik.http.routers.app-ja.rule=Host(`${PUBLIC_URL}`)"
+      - "traefik.http.routers.app-ja.rule=Host(`<clientUrl>`)"
       - "traefik.http.routers.app-ja.entrypoints=web"
       - "traefik.http.services.app-ja.loadbalancer.server.port=80"
       - "traefik.http.routers.app-ja.tls.certresolver=letsencrypt"