diff --git a/dev/forward-to-legacy-nginx.yaml b/dev/forward-to-legacy-nginx.yaml index a98b97e..87be2a6 100644 --- a/dev/forward-to-legacy-nginx.yaml +++ b/dev/forward-to-legacy-nginx.yaml @@ -23,7 +23,7 @@ tcp: nginx-legacy-router-secure: # DO NOT use "*". List the domains that Nginx manages itself. # If you use "*", Traefik's own HTTPS domains will not work. - rule: "HostSNI(`excali.kovagoadi.hu`, `another-legacy.hu`)" + rule: "HostSNI(`excali.kovagoadi.hu`) || HostSNI(`another-legacy.hu`)" service: nginx-legacy-service-secure tls: passthrough: true @@ -39,8 +39,7 @@ tcp: http: routers: - # 1. TRAEFIK-MANAGED ACME HANDLER - + # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router) # 2. THE HTTP CATCH-ALL (Sends other ACME and HTTP to Nginx) nginx-legacy-router: diff --git a/docker-compose.yaml b/docker-compose.yaml index b0c32f3..a6ea120 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,5 @@ services: - traefik4: + traefik3: image: "traefik:v3.6@sha256:4ec25d36f3203240bc1631bb43954c61e872331ab693e741398f1dde6974c145" restart: unless-stopped security_opt: @@ -19,10 +19,6 @@ services: - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web" - "--certificatesresolvers.letsencrypt.acme.email=kovagoadi@gmail.com" - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json" - - "traefik.http.routers.traefik-acme-handler.rule=Host(`test-whoami.dev.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)" - - "traefik.http.routers.traefik-acme-handler.entrypoints=web" - - "traefik.http.routers.traefik-acme-handler.service=acme-http@internal" - - "traefik.http.routers.traefik-acme-handler.priority=1000" - "${TRAEFIK_LEGACY_OPT:-}" - "--providers.file.watch=true" ports: @@ -42,12 +38,12 @@ services: labels: - "env=${ENV}" - "traefik.enable=true" + - "traefik.http.routers.whoami.priority=10000" - "traefik.http.routers.whoami.rule=Host(`test-whoami.${DOMAIN}`)" - "traefik.http.routers.https.rule=Host(`test-whoami.${DOMAIN}`)" - "traefik.http.routers.whoami.entrypoints=web" - traefik.http.routers.https.entrypoints=https - traefik.http.routers.https.tls=true - - traefik.http.routers.https.tls.certresolver=letsencrypt networks: proxy: legacy-nginx: