From e292a67ded73320fd0f98251a2ed775fdee0a483 Mon Sep 17 00:00:00 2001 From: tm16-medma Date: Mon, 23 Mar 2026 13:11:27 +0100 Subject: [PATCH] refactor: simplify OVIS frontend Traefik routing to single CCP router Collapse the `/ccp-ovis` slash-redirect and prefix-strip flow into one `ovis-frontend-ccp` router by attaching both middlewares in order (redirect, then strip). This removes redundant router labels while preserving canonical `/ccp-ovis -> /ccp-ovis/` behavior and mounted-path forwarding to the frontend service. --- ccp/modules/ovis-compose.yml | 7 +------ ccp/modules/ovis-setup.sh | 5 +---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ccp/modules/ovis-compose.yml b/ccp/modules/ovis-compose.yml index ba411b6e..53a7be95 100644 --- a/ccp/modules/ovis-compose.yml +++ b/ccp/modules/ovis-compose.yml @@ -68,16 +68,11 @@ services: condition: service_healthy labels: - "traefik.enable=true" - - "traefik.http.routers.ovis-frontend-ccp-slash.tls=true" - - "traefik.http.routers.ovis-frontend-ccp-slash.rule=Path(`/ccp-ovis`)" - - "traefik.http.routers.ovis-frontend-ccp-slash.priority=1000" - - "traefik.http.routers.ovis-frontend-ccp-slash.middlewares=ovis-frontend-ccp-slash-redirect" - - "traefik.http.routers.ovis-frontend-ccp-slash.service=ovis-frontend" - "traefik.http.middlewares.ovis-frontend-ccp-slash-redirect.redirectregex.regex=^https?://([^/]+)/ccp-ovis$" - "traefik.http.middlewares.ovis-frontend-ccp-slash-redirect.redirectregex.replacement=https://$${1}/ccp-ovis/" - "traefik.http.middlewares.ovis-frontend-ccp-slash-redirect.redirectregex.permanent=true" - "traefik.http.routers.ovis-frontend-ccp.tls=true" - "traefik.http.routers.ovis-frontend-ccp.rule=PathPrefix(`/ccp-ovis`)" - "traefik.http.middlewares.ovis-frontend-ccp-strip.stripprefix.prefixes=/ccp-ovis" - - "traefik.http.routers.ovis-frontend-ccp.middlewares=ovis-frontend-ccp-strip" + - "traefik.http.routers.ovis-frontend-ccp.middlewares=ovis-frontend-ccp-slash-redirect,ovis-frontend-ccp-strip" - "traefik.http.services.ovis-frontend.loadbalancer.server.port=5173" diff --git a/ccp/modules/ovis-setup.sh b/ccp/modules/ovis-setup.sh index cf227f7b..41d59b1e 100644 --- a/ccp/modules/ovis-setup.sh +++ b/ccp/modules/ovis-setup.sh @@ -1,9 +1,6 @@ #!/bin/bash -e if [ -n "$ENABLE_OVIS" ]; then - if declare -F log >/dev/null 2>&1; then - log INFO "OVIS setup detected -- will start OVIS services." - fi - + log INFO "OVIS setup detected -- will start OVIS services." OVERRIDE+=" -f ./$PROJECT/modules/ovis-compose.yml" fi