samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review comments

This commit is contained in:
Tobias Kussel 2023-05-19 11:53:03 +00:00
parent a18b63e190
commit ff4fb06ad1
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -85,7 +85,7 @@ To request a new repository, please contact your research network administration
- For the ccp project: support-ccp@dkfz-heidelberg.de - For the ccp project: support-ccp@dkfz-heidelberg.de
Mention: 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) - site name (According to conventions listed above)
- operator name and email - operator name and email

2
bbmri/modules/dnpm-compose.yml
View File

@ -23,7 +23,7 @@ services:
dnpm-beam-connect: dnpm-beam-connect:
depends_on: [ dnpm-beam-proxy ] 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 container_name: bridgehead-dnpm-beam-connect
environment: environment:
PROXY_URL: http://dnpm-beam-proxy:8081 PROXY_URL: http://dnpm-beam-proxy:8081

4
bbmri/modules/dnpm-setup.sh
View File

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
if [ -n "${ENABLE_DNPM}" ]; then 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" OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml"
# Set variables required for Beam-Connect # 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_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_ID="broker.dev.ccp-it.dktk.dkfz.de"
DNPM_BROKER_URL="https://${DNPM_BROKER_ID}" DNPM_BROKER_URL="https://${DNPM_BROKER_ID}"

2
bbmri/vars
View File

@ -8,7 +8,7 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
for module in $PROJECT/modules/*.sh for module in $PROJECT/modules/*.sh
do do
log INFO "sourcing $module" log DEBUG "sourcing $module"
source $module source $module
done done

4
bridgehead
View File

@ -56,7 +56,7 @@ loadVars() {
OVERRIDE=${OVERRIDE:=""} OVERRIDE=${OVERRIDE:=""}
# minimal contains shared components, so potential overrides must be applied in every project # minimal contains shared components, so potential overrides must be applied in every project
if [ -f "minimal/docker-compose.override.yml" ]; then 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" OVERRIDE+=" -f ./minimal/docker-compose.override.yml"
fi fi
if [ -f "$PROJECT/docker-compose.override.yml" ]; then if [ -f "$PROJECT/docker-compose.override.yml" ]; then
@ -78,7 +78,7 @@ case "$ACTION" in
;; ;;
stop) stop)
loadVars 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 $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 exec $COMPOSE -f ./minimal/docker-compose.yml -f ./$PROJECT/docker-compose.yml $OVERRIDE down
;; ;;

2
ccp/modules/dnpm-compose.yml
View File

@ -8,7 +8,7 @@ services:
dnpm-beam-connect: dnpm-beam-connect:
depends_on: [ beam-proxy ] 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 container_name: bridgehead-dnpm-beam-connect
environment: environment:
PROXY_URL: http://beam-proxy:8081 PROXY_URL: http://beam-proxy:8081

4
ccp/modules/dnpm-setup.sh
View File

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
if [ -n "${ENABLE_DNPM}" ]; then 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" OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml"
# Set variables required for Beam-Connect # 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_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
fi fi

2
ccp/vars
View File

@ -21,6 +21,6 @@ mtbaSetup
for module in $PROJECT/modules/*.sh for module in $PROJECT/modules/*.sh
do do
log INFO "sourcing $module" log DEBUG "sourcing $module"
source $module source $module
done done

2
minimal/modules/dnpm-compose.yml
View File

@ -23,7 +23,7 @@ services:
dnpm-beam-connect: dnpm-beam-connect:
depends_on: [ dnpm-beam-proxy ] 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 container_name: bridgehead-dnpm-beam-connect
environment: environment:
PROXY_URL: http://dnpm-beam-proxy:8081 PROXY_URL: http://dnpm-beam-proxy:8081

4
minimal/modules/dnpm-setup.sh
View File

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
if [ -n "${ENABLE_DNPM}" ]; then 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" OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml"
# Set variables required for Beam-Connect # 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_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_ID="broker.dev.ccp-it.dktk.dkfz.de"
DNPM_BROKER_URL="https://${DNPM_BROKER_ID}" DNPM_BROKER_URL="https://${DNPM_BROKER_ID}"

2
minimal/vars
View File

@ -1,5 +1,5 @@
for module in $PROJECT/modules/*.sh for module in $PROJECT/modules/*.sh
do do
log INFO "sourcing $module" log DEBUG "sourcing $module"
source $module source $module
done done