From 3a42570ac4c6842986c981ca4ec520b5436c2c8f Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Tue, 4 Apr 2023 13:11:33 +0200 Subject: [PATCH] Add DNPM discovery URL as public configuration --- dnpm/dnpm-setup.sh | 4 ++-- dnpm/vars | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 dnpm/vars diff --git a/dnpm/dnpm-setup.sh b/dnpm/dnpm-setup.sh index 3b94a86..ff32c68 100644 --- a/dnpm/dnpm-setup.sh +++ b/dnpm/dnpm-setup.sh @@ -6,10 +6,10 @@ function dnpmSetup() { OVERRIDE+=" -f ./dnpm/dnpm-compose-beamconnect.yml" DNPM_APPLICATION_SECRET="$(echo \"This is a salt string to generate one consistent password. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" DNPM_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" - source /etc/bridgehead/dnpm/shared-but-secret-vars || fail_and_report 1 "Unable to load /etc/bridgehead/dnpm/shared-but-secret-vars" + source /srv/docker/bridgehead/dnpm/vars || fail_and_report 1 "Unable to load /srv/docker/bridgehead/dnpm/vars" export DNPM_DISCOVERY_URL if [ -e /etc/bridgehead/dnpm/bwhcConnectorConfig.xml ]; then - log INFO "DNPM setup detected (with Frontend/Backend) -- will start BWHC Frontend/Backend." + log INFO "DNPM setup detected (with Frontend/Backend) -- will start BWHC Frontend/Backend. This is highly experimental!" OVERRIDE+=" -f ./dnpm/dnpm-compose-bwhc.yml" fi fi diff --git a/dnpm/vars b/dnpm/vars new file mode 100644 index 0000000..69c2220 --- /dev/null +++ b/dnpm/vars @@ -0,0 +1 @@ +DNPM_DISCOVERY_URL=https://dnpm.medizin.uni-tuebingen.de/sites