diff --git a/overrides/compose.custom-domain.yaml b/overrides/compose.custom-domain.yaml index 7ca31776..ca1b54f7 100644 --- a/overrides/compose.custom-domain.yaml +++ b/overrides/compose.custom-domain.yaml @@ -14,7 +14,6 @@ services: - traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=2016 - traefik.http.routers.${ROUTER}.service=${ROUTER} - traefik.http.routers.${ROUTER}.entrypoints=http - - traefik.http.routers.${ROUTER}.ruleSyntax=v3 - traefik.http.routers.${ROUTER}.rule=${SITES_RULE?SITES_RULE not set} - traefik.http.middlewares.${ROUTER}.headers.customrequestheaders.Host=${BASE_SITE?BASE_SITE not set} - traefik.http.routers.${ROUTER}.middlewares=${ROUTER} diff --git a/overrides/compose.https.yaml b/overrides/compose.https.yaml index 13555363..32ef2bae 100644 --- a/overrides/compose.https.yaml +++ b/overrides/compose.https.yaml @@ -5,7 +5,6 @@ services: - traefik.http.services.frontend.loadbalancer.server.port=8080 - traefik.http.routers.frontend-http.entrypoints=websecure - traefik.http.routers.frontend-http.tls.certresolver=main-resolver - - traefik.http.routers.frontend-http.ruleSyntax=v3 - traefik.http.routers.frontend-http.rule=${SITES_RULE:?SITES_RULE not set} proxy: @@ -14,9 +13,6 @@ services: command: - --providers.docker=true - --providers.docker.exposedbydefault=false - # Keep v2 rule syntax for now - # Ensure compatibility with existing labels (will be removed if v3 transition is complete) - - --core.defaultRuleSyntax=v2 - --entrypoints.web.address=:80 - --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.scheme=https diff --git a/overrides/compose.multi-bench-ssl.yaml b/overrides/compose.multi-bench-ssl.yaml index e38da19b..1c5e3dac 100644 --- a/overrides/compose.multi-bench-ssl.yaml +++ b/overrides/compose.multi-bench-ssl.yaml @@ -5,7 +5,6 @@ services: - traefik.http.routers.${ROUTER}-http.middlewares=https-redirect # ${ROUTER}-https the actual router using HTTPS # Uses the environment variable SITES_RULE - - traefik.http.routers.${ROUTER}-https.ruleSyntax=v3 - traefik.http.routers.${ROUTER}-https.rule=${SITES_RULE?SITES_RULE not set} - traefik.http.routers.${ROUTER}-https.entrypoints=https - traefik.http.routers.${ROUTER}-https.tls=true diff --git a/overrides/compose.multi-bench.yaml b/overrides/compose.multi-bench.yaml index 542e7716..d499686b 100644 --- a/overrides/compose.multi-bench.yaml +++ b/overrides/compose.multi-bench.yaml @@ -9,7 +9,6 @@ services: - traefik.http.services.${ROUTER?ROUTER not set}.loadbalancer.server.port=8080 - traefik.http.routers.${ROUTER}-http.service=${ROUTER} - traefik.http.routers.${ROUTER}-http.entrypoints=http - - traefik.http.routers.${ROUTER}-http.ruleSyntax=v3 - traefik.http.routers.${ROUTER}-http.rule=${SITES_RULE?SITES_RULE not set} configurator: networks: diff --git a/overrides/compose.proxy.yaml b/overrides/compose.proxy.yaml index a47b3a7e..4b084eaa 100644 --- a/overrides/compose.proxy.yaml +++ b/overrides/compose.proxy.yaml @@ -4,7 +4,6 @@ services: - traefik.enable=true - traefik.http.services.frontend.loadbalancer.server.port=8080 - traefik.http.routers.frontend-http.entrypoints=web - - traefik.http.routers.frontend-http.ruleSyntax=v3 - traefik.http.routers.frontend-http.rule=HostRegexp(`^.+$`) proxy: @@ -12,9 +11,6 @@ services: command: - --providers.docker - --providers.docker.exposedbydefault=false - # Keep v2 rule syntax for now - # Ensure compatibility with existing labels (will be removed if v3 transition is complete) - - --core.defaultRuleSyntax=v2 - --entrypoints.web.address=:80 ports: - ${HTTP_PUBLISH_PORT:-80}:80 diff --git a/overrides/compose.traefik-ssl.yaml b/overrides/compose.traefik-ssl.yaml index 2563363c..b83cb8e4 100644 --- a/overrides/compose.traefik-ssl.yaml +++ b/overrides/compose.traefik-ssl.yaml @@ -9,7 +9,6 @@ services: - traefik.http.routers.traefik-public-http.middlewares=https-redirect # traefik-https the actual router using HTTPS # Uses the environment variable DOMAIN - - traefik.http.routers.traefik-public-https.ruleSyntax=v3 - traefik.http.routers.traefik-public-https.rule=Host(`${TRAEFIK_DOMAIN}`) - traefik.http.routers.traefik-public-https.entrypoints=https - traefik.http.routers.traefik-public-https.tls=true @@ -24,9 +23,6 @@ services: - --providers.docker=true # Do not expose all Docker services, only the ones explicitly exposed - --providers.docker.exposedbydefault=false - # Keep v2 rule syntax for now - # Ensure compatibility with existing labels (will be removed if v3 transition is complete) - - --core.defaultRuleSyntax=v2 # Create an entrypoint http listening on port 80 - --entrypoints.http.address=:80 # Create an entrypoint https listening on port 443 diff --git a/overrides/compose.traefik.yaml b/overrides/compose.traefik.yaml index e36fcd2b..3dd2069f 100644 --- a/overrides/compose.traefik.yaml +++ b/overrides/compose.traefik.yaml @@ -11,7 +11,6 @@ services: # Using the environment variables USERNAME and HASHED_PASSWORD - traefik.http.middlewares.admin-auth.basicauth.users=admin:${HASHED_PASSWORD:?No HASHED_PASSWORD set} # Uses the environment variable TRAEFIK_DOMAIN - - traefik.http.routers.traefik-public-http.ruleSyntax=v3 - traefik.http.routers.traefik-public-http.rule=Host(`${TRAEFIK_DOMAIN:?No TRAEFIK_DOMAIN set}`) - traefik.http.routers.traefik-public-http.entrypoints=http # Use the special Traefik service api@internal with the web UI/Dashboard @@ -25,9 +24,6 @@ services: - --providers.docker=true # Do not expose all Docker services, only the ones explicitly exposed - --providers.docker.exposedbydefault=false - # Keep v2 rule syntax for now - # Ensure compatibility with existing labels (will be removed if v3 transition is complete) - - --core.defaultRuleSyntax=v2 # Create an entrypoint http listening on port 80 - --entrypoints.http.address=:80 # Enable the access log, with HTTP requests