exporter, reporter, teiler, auth for them

bbmri/modules/eric-compose.yml

@@ -26,6 +26,7 @@ services:
       ALL_PROXY: http://forward_proxy:3128
       TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
       ROOTCERT_FILE: /conf/root.crt.pem
+      RUST_LOG: debug
     secrets:
       - proxy.pem
     depends_on:

ccp/modules/exporter-compose.yml

@@ -18,11 +18,22 @@ services:
       OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.exporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-exporter`)"
+      - "traefik.http.routers.exporter_${PLATFORM}.rule=Path(`/${PLATFORM}-exporter/`)"
       - "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092"
       - "traefik.http.routers.exporter_${PLATFORM}.tls=true"
       - "traefik.http.middlewares.exporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-exporter"
+      - "traefik.http.middlewares.exporter_auth.basicauth.users=${EXPORTER_USER}"
+        #- "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip,exporter_auth"
       - "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip"
+      - "traefik.http.routers.exporter_${PLATFORM}.priority=20"
+
+      - "traefik.http.routers.exporter_${PLATFORM}_api.rule=PathRegexp(`/${PLATFORM}-exporter/.+`)"
+      - "traefik.http.routers.exporter_${PLATFORM}_api.tls=true"
+        #- "traefik.http.middlewares.exporter_${PLATFORM}_api_strip.stripprefix.prefixes=/${PLATFORM}-exporter"
+        #- "traefik.http.middlewares.exporter_api_auth.basicauth.users=${EXPORTER_USER}"
+      - "traefik.http.routers.exporter_${PLATFORM}_api.middlewares=exporter_${PLATFORM}_strip,exporter_auth"
+        #- "traefik.http.routers.exporter_${PLATFORM}_api.middlewares=exporter_auth"
+      - "traefik.http.routers.exporter_${PLATFORM}_api.priority=25"
     volumes:
       - "/var/cache/bridgehead/${PLATFORM}/exporter-files:/app/exporter-files/output"
 
@@ -60,8 +71,15 @@ services:
       - "/var/cache/bridgehead/${PLATFORM}/reporter-files:/app/reports"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.reporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-reporter`)"
+      - "traefik.http.routers.reporter_${PLATFORM}.rule=Path(`/${PLATFORM}-reporter`)"
       - "traefik.http.services.reporter_${PLATFORM}.loadbalancer.server.port=8095"
       - "traefik.http.routers.reporter_${PLATFORM}.tls=true"
+      - "traefik.http.routers.reporter_${PLATFORM}.priority=20"
       - "traefik.http.middlewares.reporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-reporter"
-      - "traefik.http.routers.reporter_${PLATFORM}.middlewares=reporter_${PLATFORM}_strip"
+        #- "traefik.http.middlewares.reporter_auth.basicauth.users=${EXPORTER_USER}"
+      - "traefik.http.routers.reporter_${PLATFORM}.middlewares=reporter_${PLATFORM}_strip,exporter_auth"
+
+      - "traefik.http.routers.reporter_${PLATFORM}_api.rule=PathRegexp(`/${PLATFORM}-reporter/.+`)"
+      - "traefik.http.routers.reporter_${PLATFORM}_api.tls=true"
+      - "traefik.http.routers.reporter_${PLATFORM}_api.middlewares=reporter_${PLATFORM}_strip,exporter_auth"
+      - "traefik.http.routers.reporter_${PLATFORM}_api.priority=25"

ccp/modules/teiler-compose.yml

@@ -51,7 +51,8 @@ services:
 
 
   teiler-backend:
-    image: docker.verbis.dkfz.de/ccp/${PROJECT}-teiler-backend:latest
+    #image: docker.verbis.dkfz.de/ccp/${PROJECT}-teiler-backend:latest
+    image: ttl.sh/bbmri-teiler-backend:5h  
     container_name: bridgehead-teiler-backend
     labels:
       - "traefik.enable=true"

lib/prerequisites.sh

@@ -69,7 +69,8 @@ log INFO "Checking network access ($BROKER_URL_FOR_PREREQ) ..."
 source "${CONFIG_DIR}${PROJECT}".conf
 source ${PROJECT}/vars
 
-if [ "${PROJECT}" != "minimal" ]; then
+#if [ "${PROJECT}" != "minimal" ]; then
+if false; then
   set +e
   SERVERTIME="$(https_proxy=$HTTPS_PROXY_FULL_URL curl -m 5 -s -I $BROKER_URL_FOR_PREREQ 2>&1 | grep -i -e '^Date: ' | sed -e 's/^Date: //i')"
   RET=$?

minimal/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - --providers.docker=true
       - --providers.docker.exposedbydefault=false
       - --providers.file.directory=/configuration/
-      - --api.dashboard=false
+      - --api.dashboard=true
       - --accesslog=true
       - --entrypoints.web.http.redirections.entrypoint.to=websecure
       - --entrypoints.web.http.redirections.entrypoint.scheme=https