diff --git a/README.md b/README.md index 550f563..8daab1f 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ To request a new repository, please contact your research network administration - For the ccp project: support-ccp@dkfz-heidelberg.de Mention: -- which project you belong to, i.e. "bbmri", "ccp", or "minimal" +- which project you belong to, i.e. "bbmri" or "ccp" - site name (According to conventions listed above) - operator name and email diff --git a/bbmri/modules/dnpm-compose.yml b/bbmri/modules/dnpm-compose.yml index 0175bf5..48d58de 100644 --- a/bbmri/modules/dnpm-compose.yml +++ b/bbmri/modules/dnpm-compose.yml @@ -23,7 +23,7 @@ services: dnpm-beam-connect: depends_on: [ dnpm-beam-proxy ] - image: docker.verbis.dkfz.de/cache/samply/beam-connect:sites-without-auth + image: docker.verbis.dkfz.de/cache/samply/beam-connect:dnpm container_name: bridgehead-dnpm-beam-connect environment: PROXY_URL: http://dnpm-beam-proxy:8081 diff --git a/bbmri/modules/dnpm-setup.sh b/bbmri/modules/dnpm-setup.sh index 4ece115..c8b003e 100644 --- a/bbmri/modules/dnpm-setup.sh +++ b/bbmri/modules/dnpm-setup.sh @@ -1,11 +1,11 @@ #!/bin/bash if [ -n "${ENABLE_DNPM}" ]; then - log INFO "DNPM setup detected (Beam.Connect) -- will start Beam.Connect for DNPM." + log DEBUG "DNPM setup detected (Beam.Connect) -- will start Beam and Beam.Connect for DNPM." OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml" # Set variables required for Beam-Connect - 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_APPLICATION_SECRET="$(echo \"This is a salt string to generate one consistent password for DNPM. It is not required to be secret.\" | openssl pkeyutl -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)" DNPM_BROKER_ID="broker.dev.ccp-it.dktk.dkfz.de" DNPM_BROKER_URL="https://${DNPM_BROKER_ID}" diff --git a/bbmri/vars b/bbmri/vars index b5be616..21aeaec 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -8,7 +8,7 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem for module in $PROJECT/modules/*.sh do - log INFO "sourcing $module" + log DEBUG "sourcing $module" source $module done diff --git a/bridgehead b/bridgehead index 8d35708..b14d1d3 100755 --- a/bridgehead +++ b/bridgehead @@ -56,7 +56,7 @@ loadVars() { OVERRIDE=${OVERRIDE:=""} # minimal contains shared components, so potential overrides must be applied in every project if [ -f "minimal/docker-compose.override.yml" ]; then - log INFO "Applying minimal/docker-compose.override.yml" + log INFO "Applying Bridgehead common components override (minimal/docker-compose.override.yml)" OVERRIDE+=" -f ./minimal/docker-compose.override.yml" fi if [ -f "$PROJECT/docker-compose.override.yml" ]; then @@ -78,7 +78,7 @@ case "$ACTION" in ;; stop) loadVars - # HACK: This is tempoarily to properly shut down false bridgehead instances (bridgehead-ccp instead ccp) + # HACK: This is temporarily to properly shut down false bridgehead instances (bridgehead-ccp instead ccp) $COMPOSE -p bridgehead-$PROJECT -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE down exec $COMPOSE -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE down ;; diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index 2f523b9..a4ef1aa 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -8,7 +8,7 @@ services: dnpm-beam-connect: depends_on: [ beam-proxy ] - image: docker.verbis.dkfz.de/cache/samply/beam-connect:sites-without-auth + image: docker.verbis.dkfz.de/cache/samply/beam-connect:dnpm container_name: bridgehead-dnpm-beam-connect environment: PROXY_URL: http://beam-proxy:8081 diff --git a/ccp/modules/dnpm-setup.sh b/ccp/modules/dnpm-setup.sh index c9250cb..04659eb 100644 --- a/ccp/modules/dnpm-setup.sh +++ b/ccp/modules/dnpm-setup.sh @@ -1,10 +1,10 @@ #!/bin/bash if [ -n "${ENABLE_DNPM}" ]; then - log INFO "DNPM setup detected (Beam.Connect) -- will start Beam.Connect for DNPM." + log DEBUG "DNPM setup detected (Beam.Connect) -- will start Beam.Connect for DNPM." OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml" # Set variables required for Beam-Connect - 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_APPLICATION_SECRET="$(echo \"This is a salt string to generate one consistent password for DNPM. It is not required to be secret.\" | openssl pkeyutl -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)" fi diff --git a/ccp/vars b/ccp/vars index 2a295f4..a180d82 100644 --- a/ccp/vars +++ b/ccp/vars @@ -21,6 +21,6 @@ mtbaSetup for module in $PROJECT/modules/*.sh do - log INFO "sourcing $module" + log DEBUG "sourcing $module" source $module done diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml index a2eb0b0..f320ead 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -23,7 +23,7 @@ services: dnpm-beam-connect: depends_on: [ dnpm-beam-proxy ] - image: docker.verbis.dkfz.de/cache/samply/beam-connect:sites-without-auth + image: docker.verbis.dkfz.de/cache/samply/beam-connect:dnpm container_name: bridgehead-dnpm-beam-connect environment: PROXY_URL: http://dnpm-beam-proxy:8081 diff --git a/minimal/modules/dnpm-setup.sh b/minimal/modules/dnpm-setup.sh index 4ece115..c8b003e 100644 --- a/minimal/modules/dnpm-setup.sh +++ b/minimal/modules/dnpm-setup.sh @@ -1,11 +1,11 @@ #!/bin/bash if [ -n "${ENABLE_DNPM}" ]; then - log INFO "DNPM setup detected (Beam.Connect) -- will start Beam.Connect for DNPM." + log DEBUG "DNPM setup detected (Beam.Connect) -- will start Beam and Beam.Connect for DNPM." OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml" # Set variables required for Beam-Connect - 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_APPLICATION_SECRET="$(echo \"This is a salt string to generate one consistent password for DNPM. It is not required to be secret.\" | openssl pkeyutl -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)" DNPM_BROKER_ID="broker.dev.ccp-it.dktk.dkfz.de" DNPM_BROKER_URL="https://${DNPM_BROKER_ID}" diff --git a/minimal/vars b/minimal/vars index acca503..fe661ed 100644 --- a/minimal/vars +++ b/minimal/vars @@ -1,5 +1,5 @@ for module in $PROJECT/modules/*.sh do - log INFO "sourcing $module" + log DEBUG "sourcing $module" source $module done