Teiler and Exporter in BBMRI#312
Merged
Merged
Conversation
djuarezgf
force-pushed
the
feature/bbmri-teiler-and-exporter
branch
3 times, most recently
from
863d622 to
8ff1e41
Compare
Threated
requested changes
Jun 2, 2025
| if [ -z "$EXPORTER_USER" ]; then | ||
| log "INFO" "Now generating basic auth for the exporter and reporter (see adduser in bridgehead for more information). " | ||
| generated_passwd="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 32)" | ||
| add_basic_auth_user $PROJECT $generated_passwd "EXPORTER_USER" $PROJECT |
Member
There was a problem hiding this comment.
We usually generate the basic auth users for traefik in lib/install_bridgehead.sh this has the disadvantage of requiring the admin to run bridgehead install again but doing it that way the EXPORTER_USER is already exported on the next start. I think with this logic you would need to restart the bridgehead one more time as the the env var is not set. Although I guess you could just set it manually here as you know the pw.
Member
There was a problem hiding this comment.
We should extend the add user function in the bridgehead script to not require a new install command, but generate Exporter Users. Currently the function only allows LDM_User and NNGM_User
| OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml" | ||
| TEILER_DEFAULT_LANGUAGE=EN | ||
| TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,} | ||
| # add_public_oidc_redirect_url "/ccp-teiler/*" |
Member
There was a problem hiding this comment.
Suggested change
| # add_public_oidc_redirect_url "/ccp-teiler/*" |
Comment on lines
+304
to
+331
|
|
||
| if [ "$PROJECT" == "bbmri" ]; then | ||
| # If the project is BBMRI, use the BBMRI-ERIC broker and not the GBN broker | ||
| proxy_id=$ERIC_PROXY_ID | ||
| broker_url=$ERIC_BROKER_URL | ||
| broker_id=$ERIC_BROKER_ID | ||
| root_crt_file="/srv/docker/bridgehead/bbmri/modules/${ERIC_ROOT_CERT}.root.crt.pem" | ||
| else | ||
| proxy_id=$PROXY_ID | ||
| broker_url=$BROKER_URL | ||
| broker_id=$BROKER_ID | ||
| root_crt_file="/srv/docker/bridgehead/$PROJECT/root.crt.pem" | ||
| fi | ||
|
|
||
| mkdir -p /var/cache/bridgehead/secrets/ || fail_and_report 1 "Failed to create '/var/cache/bridgehead/secrets/'. Please run sudo './bridgehead install $PROJECT' again." | ||
| touch /var/cache/bridgehead/secrets/oidc | ||
| echo $PRIVATEKEYFILENAME | ||
| docker run --rm \ | ||
| -v /var/cache/bridgehead/secrets/oidc:/usr/local/cache \ | ||
| -v $PRIVATEKEYFILENAME:/run/secrets/privkey.pem:ro \ | ||
| -v /srv/docker/bridgehead/$PROJECT/root.crt.pem:/run/secrets/root.crt.pem:ro \ | ||
| -v $root_crt_file:/run/secrets/root.crt.pem:ro \ | ||
| -v /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro \ | ||
| -e TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs \ | ||
| -e NO_PROXY=localhost,127.0.0.1 \ | ||
| -e ALL_PROXY=$HTTPS_PROXY_FULL_URL \ | ||
| -e PROXY_ID=$PROXY_ID \ | ||
| -e BROKER_URL=$BROKER_URL \ | ||
| -e OIDC_PROVIDER=secret-sync-central.central-secret-sync.$BROKER_ID \ | ||
| -e PROXY_ID=$proxy_id \ | ||
| -e BROKER_URL=$broker_url \ | ||
| -e OIDC_PROVIDER=secret-sync-central.central-secret-sync.$broker_id \ |
Member
There was a problem hiding this comment.
I think I would throw out the special casing for now as its unclear that bbmri will ever automatic oidc enrollment
Member
There was a problem hiding this comment.
That should be part of a different PR, right?
Member
There was a problem hiding this comment.
Yeah if this even ever happens in bbmri
djuarezgf
force-pushed
the
feature/bbmri-teiler-and-exporter
branch
2 times, most recently
from
1863be8 to
c1c0723
Compare
Threated
requested changes
Jun 5, 2025
Comment on lines
+15
to
+16
|
|
||
| POSTGRES_TAG=15.6-alpine |
djuarezgf
force-pushed
the
feature/bbmri-teiler-and-exporter
branch
from
da15fbe to
5107c0a
Compare
Threated
approved these changes
Jun 5, 2025
mmwaikar
pushed a commit
that referenced
this pull request
Jan 28, 2026
Co-authored-by: Jan <59206115+Threated@users.noreply.github.com>
mmwaikar
pushed a commit
that referenced
this pull request
Jan 28, 2026
Co-authored-by: Jan <59206115+Threated@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR supersedes #310. It integrates the Teiler and Exporter functionalities into the BBMRI project.