update new broker

This commit is contained in:
juarez 2023-07-07 09:52:35 +02:00
parent 4ba5144140
commit 44134550ac
5 changed files with 12 additions and 20 deletions

View File

@ -49,6 +49,8 @@ services:
EXPORTER_API_KEY: "${EXPORTER_API_KEY}" EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
EXPORTER_URL: "http://exporter:8092" EXPORTER_URL: "http://exporter:8092"
LOG_FHIR_VALIDATION: "false" LOG_FHIR_VALIDATION: "false"
# volumes:
# - "bridgehead-reporter:/app/reports"
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.reporter_ccp.rule=PathPrefix(`/ccp-reporter`)" - "traefik.http.routers.reporter_ccp.rule=PathPrefix(`/ccp-reporter`)"
@ -62,3 +64,5 @@ volumes:
name: "bridgehead-exporter-db" name: "bridgehead-exporter-db"
# bridgehead-exporter: # bridgehead-exporter:
# name: "bridgehead-exporter" # name: "bridgehead-exporter"
# bridgehead-reporter:
# name: "bridgehead-reporter"

View File

@ -51,18 +51,3 @@ function legacyIdMapping() {
normalized_string=$(applySpecialCases "$uppercase_string"); normalized_string=$(applySpecialCases "$uppercase_string");
echo "$normalized_string" | tr -d ' ' echo "$normalized_string" | tr -d ' '
} }
if [ -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
log INFO "id-management setup detected -- will start id-management (mainzelliste & magicpl)."
OVERRIDE+=" -f ./$PROJECT/modules/id-management-compose.yml"
# Auto Generate local Passwords
PATIENTLIST_POSTGRES_PASSWORD="$(echo \"id-management-module-db-password-salt\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
IDMANAGER_LOCAL_PATIENTLIST_APIKEY="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
# Transform Seeds Configuration to pass it to the Mainzelliste Container
PATIENTLIST_SEEDS_TRANSFORMED="$(declare -p PATIENTLIST_SEEDS | tr -d '\"' | sed 's/\[/\[\"/g' | sed 's/\]/\"\]/g')"
# Ensure old ids are working !!!
export IDMANAGEMENT_FRIENDLY_ID=$(legacyIdMapping "$SITE_ID")
fi

View File

@ -19,11 +19,11 @@ services:
FILE_CHARSET: ${MTBA_FILE_CHARSET} FILE_CHARSET: ${MTBA_FILE_CHARSET}
FILE_END_OF_LINE: ${MTBA_FILE_END_OF_LINE} FILE_END_OF_LINE: ${MTBA_FILE_END_OF_LINE}
CSV_DELIMITER: ${MTBA_CSV_DELIMITER} CSV_DELIMITER: ${MTBA_CSV_DELIMITER}
# labels: labels:
# - "traefik.enable=true" - "traefik.enable=true"
# - "traefik.http.routers.mtba.rule=PathPrefix(`/mtba`)" - "traefik.http.routers.mtba.rule=PathPrefix(`/`)"
# - "traefik.http.services.mtba.loadbalancer.server.port=80" - "traefik.http.services.mtba.loadbalancer.server.port=80"
# - "traefik.http.routers.mtba.tls=true" - "traefik.http.routers.mtba.tls=true"
volumes: volumes:
- /tmp/bridgehead/mtba/input:/app/input - /tmp/bridgehead/mtba/input:/app/input
- /tmp/bridgehead/mtba/persist:/app/persist - /tmp/bridgehead/mtba/persist:/app/persist
@ -31,3 +31,6 @@ services:
# TODO: Include CBioPortal in Deployment ... # TODO: Include CBioPortal in Deployment ...
# NOTE: CBioPortal can't load data while the system is running. So after import of data bridgehead needs to be restarted! # NOTE: CBioPortal can't load data while the system is running. So after import of data bridgehead needs to be restarted!
# TODO: Find a trigger to let mtba signal a restart for CBioPortal # TODO: Find a trigger to let mtba signal a restart for CBioPortal
volumes:
mtba-data: