samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2026-07-17 01:40:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ovis): remove redundant runtime assets

Browse Source
This commit is contained in:
tm16-medma
2026-07-16 11:39:56 +02:00
parent 61df1b6749
commit ff754f0bf1
9 changed files with 27 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridgehead
-13
View File
@@ -193,19 +193,6 @@ case "$ACTION" in
;;
postRun | postUpdate)
;;
### ovisreimport is untested, just writing down the idea to test it later
# ovisreimport)
# ./bridgehead stop ${PROJECT}
# docker volume rm ${PROJECT}_ovis-mongodb-data
# loadVars
# hc_send log "Bridgehead $PROJECT startup (ovisreimport): Checking requirements ..."
# checkRequirements
# sync_secrets
# hc_send log "Bridgehead $PROJECT startup (ovisreimport): Requirements checked out. Now starting bridgehead ..."
# exec $COMPOSE --profile ovisreimport -p $PROJECT -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit *)
# printUsage
# exit 1
# ;;
*)
printUsage
exit 1
ovis/docker-compose.yml
-8
View File
@@ -58,11 +58,6 @@ services:
ORIGIN: ${OVIS_PUBLIC_ORIGIN:-https://${HOST:-localhost}}
volumes:
- ovis-catalogue-data:/app/dynamic-catalogue:ro
- ${OVIS_CATALOGUE_FILE:-../ovis/runtime/mongodb/ovis-catalogue.json}:/app/static/ovis-catalogue.json:ro
- ${OVIS_SITE_DOWNLOADS_DIR:-../ovis/runtime/downloads}/UserAgreement/ovis_userAgreement_en_template.pdf:/app/static/downloads/ovis_userAgreement_en_template.pdf:ro
- ${OVIS_SITE_DOWNLOADS_DIR:-../ovis/runtime/downloads}/UserAgreement/ovis_userAgreement_de_template.pdf:/app/static/downloads/ovis_userAgreement_de_template.pdf:ro
- ${OVIS_SITE_DOWNLOADS_DIR:-../ovis/runtime/downloads}/Authorization/ovis_authorization_en_template.pdf:/app/static/downloads/ovis_authorization_en_template.pdf:ro
- ${OVIS_SITE_DOWNLOADS_DIR:-../ovis/runtime/downloads}/Authorization/ovis_authorization_de_template.pdf:/app/static/downloads/ovis_authorization_de_template.pdf:ro
depends_on:
ovis-backend-apollo:
condition: service_healthy
@@ -93,7 +88,6 @@ services:
http_proxy: ${OVIS_HTTP_PROXY:-}
https_proxy: ${OVIS_HTTPS_PROXY:-}
no_proxy: ${OVIS_NO_PROXY:-}
CORS_ORIGIN: "*"
DB: onc_test
ADDRESS: mongodb://ovis-backend-database-mongodb:27017
volumes:
@@ -117,7 +111,6 @@ services:
environment:
OVIS_ROOT_USERNAME: ${OVIS_ROOT_USERNAME:-ovis-root}
volumes:
- ${OVIS_MONGO_INIT_FILE:-../ovis/runtime/mongodb/initdb.js}:/docker-entrypoint-initdb.d/init.js:ro
- ovis-mongo-db:/data/db
- ovis-mongo-conf:/data/configdb
@@ -131,7 +124,6 @@ services:
http_proxy: ${OVIS_HTTP_PROXY:-}
https_proxy: ${OVIS_HTTPS_PROXY:-}
no_proxy: ${OVIS_NO_PROXY:-}
CORS_ORIGIN: "*"
DB: onc_test
ADDRESS: mongodb://ovis-backend-database-mongodb:27017
CATALOGUE_PATH: /app/generated/ovis-catalogue.json
ovis/runtime/downloads/Authorization/ovis_authorization_de_template.pdf
BIN
View File
Binary file not shown.
ovis/runtime/downloads/Authorization/ovis_authorization_en_template.pdf
BIN
View File
Binary file not shown.
ovis/runtime/downloads/UserAgreement/ovis_userAgreement_de_template.pdf
BIN
View File
Binary file not shown.
ovis/runtime/downloads/UserAgreement/ovis_userAgreement_en_template.pdf
BIN
View File
Binary file not shown.
ovis/runtime/mongodb/initdb.js
-18
View File
@@ -1,18 +0,0 @@
const rootUsername = process.env.OVIS_ROOT_USERNAME || 'ovis-root';
const databaseName = process.env.DB || 'onc_test';
db = db.getSiblingDB(databaseName);
db.createCollection('user');
db.user.insertMany([
{
_id: rootUsername,
createdAt: new Date(),
createdBy: 'system',
role: 'super-admin',
status: 'active',
pseudonymization: false,
darkMode: false,
colorTheme: 'CCCMunich',
language: 'en'
}
]);
ovis/runtime/mongodb/ovis-catalogue.json
-1
View File
@@ -1 +0,0 @@
{}
ovis/vars
+27 -34
View File
@@ -1,7 +1,6 @@
PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
BROKER_URL_FOR_PREREQ=${OVIS_PREREQ_URL:-https://github.com}
: ${ENABLE_OVIS:=true}
: ${REQUIRES_BEAM:=false}
: ${OVIS_PUBLIC_BASE_PATH:=/ovis}
: ${OVIS_PUBLIC_ORIGIN:=https://${HOST}}
@@ -15,45 +14,39 @@ BROKER_URL_FOR_PREREQ=${OVIS_PREREQ_URL:-https://github.com}
: ${PUBLIC_SYSTEM_START_LANGUAGE:=en}
: ${PUBLIC_NAV_STUDY_ENABLED:=true}
: ${PUBLIC_NAV_USER_MANAGEMENT_ENABLED:=true}
: ${OVIS_SITE_CONFIG_DIR:=/etc/bridgehead/ovis}
: ${OVIS_RUNTIME_DIR:=$(pwd)/ovis/runtime}
: ${OVIS_SITE_DOWNLOADS_DIR:=${OVIS_RUNTIME_DIR}/downloads}
: ${OVIS_SITE_CERTS_DIR:=${OVIS_RUNTIME_DIR}/certs}
: ${OVIS_SITE_KEYCLOAK_REALM_FILE:=${OVIS_RUNTIME_DIR}/keycloak/ovis-realm.json}
: ${OVIS_CATALOGUE_FILE:=${OVIS_RUNTIME_DIR}/mongodb/ovis-catalogue.json}
: ${OVIS_MONGO_INIT_FILE:=${OVIS_RUNTIME_DIR}/mongodb/initdb.js}
: ${OVIS_OPS4_FILE:=${OVIS_RUNTIME_DIR}/mongodb/ops4.mjs}
: ${OVIS_CREDOS_EXPORT_DIR:=${OVIS_RUNTIME_DIR}/input/CREDOSExportFiles}
if [ "${ENABLE_OVIS}" = "true" ]; then
mkdir -p /var/cache/bridgehead/ovis || fail_and_report 1 "Failed to create /var/cache/bridgehead/ovis"
OVIS_CREDENTIALS_FILE=${OVIS_CREDENTIALS_FILE:-/var/cache/bridgehead/ovis/credentials.env}
mkdir -p /var/cache/bridgehead/ovis || fail_and_report 1 "Failed to create /var/cache/bridgehead/ovis"
OVIS_CREDENTIALS_FILE=${OVIS_CREDENTIALS_FILE:-/var/cache/bridgehead/ovis/credentials.env}
ovis_random_secret() {
openssl rand -hex 24
}
ovis_random_secret() {
openssl rand -hex 24
}
if [ ! -f "$OVIS_CREDENTIALS_FILE" ]; then
umask 077
{
printf ': ${KEYCLOAK_ADMIN:=ovis-admin}\n'
printf ': ${KEYCLOAK_ADMIN_PASSWORD:=%s}\n' "$(ovis_random_secret)"
printf ': ${KEYCLOAK_REALM:=ovis}\n'
printf ': ${KEYCLOAK_CLIENT_ID:=ovis_client}\n'
printf ': ${KEYCLOAK_CLIENT_SECRET:=%s}\n' "$(ovis_random_secret)"
printf ': ${KEYCLOAK_ADMIN_CLIENT_ID:=admin-cli}\n'
printf ': ${KEYCLOAK_ADMIN_CLIENT_SECRET:=%s}\n' "$(ovis_random_secret)"
printf ': ${OVIS_ROOT_USERNAME:=ovis-root}\n'
printf ': ${OVIS_ROOT_PASSWORD:=%s}\n' "$(ovis_random_secret)"
printf ': ${POSTGRES_DB:=keycloak}\n'
printf ': ${POSTGRES_USER:=ovis_keycloak}\n'
printf ': ${POSTGRES_PASSWORD:=%s}\n' "$(ovis_random_secret)"
} > "$OVIS_CREDENTIALS_FILE"
fi
if [ "$(id -u)" -eq 0 ] && id bridgehead >/dev/null 2>&1; then
chown bridgehead /var/cache/bridgehead/ovis "$OVIS_CREDENTIALS_FILE"
fi
chmod 700 /var/cache/bridgehead/ovis
chmod 600 "$OVIS_CREDENTIALS_FILE"
source "$OVIS_CREDENTIALS_FILE"
if [ ! -f "$OVIS_CREDENTIALS_FILE" ]; then
umask 077
{
printf ': ${KEYCLOAK_ADMIN:=ovis-admin}\n'
printf ': ${KEYCLOAK_ADMIN_PASSWORD:=%s}\n' "$(ovis_random_secret)"
printf ': ${KEYCLOAK_REALM:=ovis}\n'
printf ': ${KEYCLOAK_CLIENT_ID:=ovis_client}\n'
printf ': ${KEYCLOAK_CLIENT_SECRET:=%s}\n' "$(ovis_random_secret)"
printf ': ${KEYCLOAK_ADMIN_CLIENT_ID:=admin-cli}\n'
printf ': ${KEYCLOAK_ADMIN_CLIENT_SECRET:=%s}\n' "$(ovis_random_secret)"
printf ': ${OVIS_ROOT_USERNAME:=ovis-root}\n'
printf ': ${OVIS_ROOT_PASSWORD:=%s}\n' "$(ovis_random_secret)"
printf ': ${POSTGRES_DB:=keycloak}\n'
printf ': ${POSTGRES_USER:=ovis_keycloak}\n'
printf ': ${POSTGRES_PASSWORD:=%s}\n' "$(ovis_random_secret)"
} > "$OVIS_CREDENTIALS_FILE"
fi
if [ "$(id -u)" -eq 0 ] && id bridgehead >/dev/null 2>&1; then
chown bridgehead /var/cache/bridgehead/ovis "$OVIS_CREDENTIALS_FILE"
fi
chmod 700 /var/cache/bridgehead/ovis
chmod 600 "$OVIS_CREDENTIALS_FILE"
source "$OVIS_CREDENTIALS_FILE"