@@ -59,7 +59,7 @@ services:
59
59
- traefik.http.services.${SWARM_STACK_NAME}_api-server.loadbalancer.healthcheck.timeout=1000ms
60
60
- traefik.http.routers.${SWARM_STACK_NAME}_api-server.rule=(Path(`/`) || Path(`/v0`) || PathPrefix(`/v0/`) || Path(`/api/v0/openapi.json`))
61
61
- traefik.http.routers.${SWARM_STACK_NAME}_api-server.entrypoints=simcore_api
62
- - traefik.http.routers.${SWARM_STACK_NAME}_api-server.priority=1
62
+ - traefik.http.routers.${SWARM_STACK_NAME}_api-server.priority=3
63
63
- traefik.http.routers.${SWARM_STACK_NAME}_api-server.middlewares=${SWARM_STACK_NAME}_gzip@swarm,ratelimit-${SWARM_STACK_NAME}_api-server,inflightreq-${SWARM_STACK_NAME}_api-server
64
64
networks :
65
65
- default
@@ -595,11 +595,11 @@ services:
595
595
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.rule=(Path(`/osparc`) || Path(`/s4l`) || Path(`/s4llite`) || Path(`/s4lacad`) || Path(`/s4lengine`) || Path(`/s4ldesktop`) || Path(`/s4ldesktopacad`) || Path(`/tis`) || Path(`/tiplite`) || Path(`/transpiled`) || Path(`/resource`) || PathPrefix(`/osparc/`) || PathPrefix(`/s4l/`) || PathPrefix(`/s4llite/`) || PathPrefix(`/s4lacad/`) || PathPrefix(`/s4lengine/`) || PathPrefix(`/s4ldesktop/`) || PathPrefix(`/s4ldesktopacad/`) || PathPrefix(`/tis/`) || PathPrefix(`/tiplite/`) || PathPrefix(`/transpiled/`) || PathPrefix(`/resource/`))
596
596
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.service=${SWARM_STACK_NAME}_static_webserver
597
597
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.entrypoints=http
598
- - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.priority=2
598
+ - traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.priority=6
599
599
- traefik.http.routers.${SWARM_STACK_NAME}_static_webserver.middlewares=${SWARM_STACK_NAME}_gzip@swarm,${SWARM_STACK_NAME}_static_webserver_retry
600
600
# catchall for legacy services (this happens if a backend disappears and a frontend tries to reconnect, the right return value is a 503)
601
601
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.service=${SWARM_STACK_NAME}_legacy_services_catchall
602
- - traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.priority=1
602
+ - traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.priority=3
603
603
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.entrypoints=http
604
604
- traefik.http.routers.${SWARM_STACK_NAME}_legacy_services_catchall.rule=PathRegexp(`^/x/(?P<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)[\/]?`)
605
605
# this tricks traefik into a 502 (bad gateway) since the service does not exist on this port
@@ -612,7 +612,7 @@ services:
612
612
# catchall for dynamic-sidecar powered-services (this happens if a backend disappears and a frontend tries to reconnect, the right return value is a 503)
613
613
- traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.service=${SWARM_STACK_NAME}_modern_services_catchall
614
614
# the priority is a bit higher than webserver, the webserver is the fallback to everything and has prio 2
615
- - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.priority=3
615
+ - traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.priority=9
616
616
- traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.entrypoints=http
617
617
# in theory the pattern should be uuid.services.OSPARC_DOMAIN, but anything could go through.. so let's catch everything
618
618
- traefik.http.routers.${SWARM_STACK_NAME}_modern_services_catchall.rule=HostRegexp(`(?P<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)\.services\.(?P<host>.+)`)
@@ -836,7 +836,7 @@ services:
836
836
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.service=${SWARM_STACK_NAME}_webserver
837
837
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.rule=(Path(`/`) || Path(`/v0`) || Path(`/socket.io/`) || Path(`/static-frontend-data.json`) || PathRegexp(`^/study/(?P<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/`))
838
838
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.entrypoints=http
839
- - traefik.http.routers.${SWARM_STACK_NAME}_webserver.priority=2
839
+ - traefik.http.routers.${SWARM_STACK_NAME}_webserver.priority=6
840
840
- 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
841
841
networks : &webserver_networks
842
842
- default
0 commit comments