Skip to content

Commit 827cab9

Browse files
committed
Revert "🐛 Fix wrong go-style UUID regexp - made portal links fail (ITISFoundation#6268)"
This reverts commit 7e10cd6.
1 parent 7e10cd6 commit 827cab9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

services/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ services:
527527
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.service=${SWARM_STACK_NAME}_legacy_services_catchall
528528
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.priority=1
529529
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.entrypoints=http
530-
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.rule=PathRegexp(`\/x\/(?i)[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}`)
530+
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.rule=(Path(`/x/{node_uuid:\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b}`) || PathPrefix(`/x/{node_uuid:\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b}/`))
531531
# this tricks traefik into a 502 (bad gateway) since the service does not exist on this port
532532
- traefik.http.services.${SWARM_STACK_NAME}_legacy_services_catchall.loadbalancer.server.port=0
533533
# this tricks traefik into returning a 503 (service unavailable) since the healthcheck will always return false
@@ -748,7 +748,7 @@ services:
748748
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.sticky.cookie.secure=true
749749
- traefik.http.middlewares.${SWARM_STACK_NAME}_webserver_retry.retry.attempts=2
750750
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.service=${SWARM_STACK_NAME}_webserver
751-
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.rule=(Path(`/`) || Path(`/v0`) || Path(`/socket.io/`) || Path(`/static-frontend-data.json`) || PathRegexp(`\/study\/(?i)[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}`) || Path(`/view`) || Path(`/#/view`) || Path(`/#/error`) || PathPrefix(`/v0/`))
751+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.rule=(Path(`/`) || Path(`/v0`) || Path(`/socket.io/`) || Path(`/static-frontend-data.json`) || Path(`/study/{study_uuid:\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b}`) || Path(`/view`) || Path(`/#/view`) || Path(`/#/error`) || PathPrefix(`/v0/`))
752752
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.entrypoints=http
753753
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.priority=2
754754
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_retry

0 commit comments

Comments
 (0)