@@ -925,10 +925,12 @@ services:
925925 labels:
926926 - io.simcore.zone =${TRAEFIK_SIMCORE_ZONE}
927927 - traefik.enable =true
928- - traefik.http.routers.fallback_html.priority =1
929- - traefik.http.routers.fallback_html.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/`))
930- - traefik.http.services.fallback_html.loadbalancer.server.port=80
931- - traefik.http.routers.fallback_html.entrypoints=http
928+
929+ # webserver
930+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_html.priority =1
931+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_html.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/`))
932+ - traefik.http.services.${PREFIX_STACK_NAME}_fallback_html.loadbalancer.server.port=80
933+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_html.entrypoints=http
932934
933935 fallback-service-api:
934936 image: nginx:1.25.1
@@ -949,24 +951,32 @@ services:
949951 labels:
950952 - io.simcore.zone=${TRAEFIK_SIMCORE_ZONE}
951953 - traefik.enable=true
952- - traefik.http.routers.fallback_api.priority=1
953- - traefik.http.routers.fallback_api.rule=Path(`/`) || Path(`/v0`) || PathPrefix(`/v0/`) || Path(`/api/v0/openapi.json`)
954- - traefik.http.services.fallback_api.loadbalancer.server.port=80
955- - traefik.http.routers.fallback_api.entrypoints=simcore_api
954+ # api-server
955+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_api.priority=1
956+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_api.rule=Path(`/`) || Path(`/v0`) || PathPrefix(`/v0/`) || Path(`/api/v0/openapi.json`)
957+ - traefik.http.services.${PREFIX_STACK_NAME}_fallback_api.loadbalancer.server.port=80
958+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_api.entrypoints=simcore_api
959+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_api.service=${PREFIX_STACK_NAME}_fallback_api
960+ # invitations
961+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_invitations_api.priority=1
962+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_invitations_api.rule=(${DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS})
963+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_invitations_api.entrypoints=http
964+ - traefik.http.services.${PREFIX_STACK_NAME}_fallback_invitations_api.loadbalancer.server.port=80
965+ - traefik.http.routers.${PREFIX_STACK_NAME}_fallback_invitations_api.service=${PREFIX_STACK_NAME}_fallback_invitations_api
956966
957967configs:
958968 {{ SWARM_STACK_NAME }}_web_html:
959969 file: ./configs/fallback-service-nginx/web/503.html
960- name: {{ SWARM_STACK_NAME}}_web_html_{{ "./configs/fallback-service-nginx/web/503.html" | sha256file | substring(0,10) }}
970+ name: {{ SWARM_STACK_NAME }}_web_html_{{ "./configs/fallback-service-nginx/web/503.html" | sha256file | substring(0,10) }}
961971 {{ SWARM_STACK_NAME }}_api_json:
962972 file: ./configs/fallback-service-nginx/api/503.json
963- name: {{ SWARM_STACK_NAME}}_api_json_{{ "./configs/fallback-service-nginx/api/503.json" | sha256file | substring(0,10) }}
973+ name: {{ SWARM_STACK_NAME }}_api_json_{{ "./configs/fallback-service-nginx/api/503.json" | sha256file | substring(0,10) }}
964974 {{ SWARM_STACK_NAME }}_web_nginx_config:
965975 file: ./configs/fallback-service-nginx/web/default.conf
966- name: {{ SWARM_STACK_NAME}}_web_nginx_config_{{ "./configs/fallback-service-nginx/web/default.conf" | sha256file | substring(0,10) }}
976+ name: {{ SWARM_STACK_NAME }}_web_nginx_config_{{ "./configs/fallback-service-nginx/web/default.conf" | sha256file | substring(0,10) }}
967977 {{ SWARM_STACK_NAME }}_api_nginx_config:
968978 file: ./configs/fallback-service-nginx/api/default.conf
969- name: {{ SWARM_STACK_NAME}}_api_nginx_config_{{ "./configs/fallback-service-nginx/api/default.conf" | sha256file | substring(0,10) }}
979+ name: {{ SWARM_STACK_NAME }}_api_nginx_config_{{ "./configs/fallback-service-nginx/api/default.conf" | sha256file | substring(0,10) }}
970980
971981volumes:
972982 rabbit_data:
0 commit comments