From 655d0d24c7be28262f555ea0786153f9a4259721 Mon Sep 17 00:00:00 2001 From: Jan <59206115+Threated@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:27:27 +0100 Subject: [PATCH 1/4] fix: remove `restart: always` in compose files (#261) --- ccp/modules/nngm-compose.yml | 1 - ccp/modules/obds2fhir-rest-compose.yml | 1 - kr/modules/obds2fhir-rest-compose.yml | 1 - minimal/modules/nngm-compose.yml | 1 - 4 files changed, 4 deletions(-) diff --git a/ccp/modules/nngm-compose.yml b/ccp/modules/nngm-compose.yml index 7ffa190..36e9f27 100644 --- a/ccp/modules/nngm-compose.yml +++ b/ccp/modules/nngm-compose.yml @@ -12,7 +12,6 @@ services: CTS_API_KEY: ${NNGM_CTS_APIKEY} CRYPT_KEY: ${NNGM_CRYPTKEY} #CTS_MAGICPL_SITE: ${SITE_ID}TODO - restart: always labels: - "traefik.enable=true" - "traefik.http.routers.connector.rule=PathPrefix(`/nngm-connector`)" diff --git a/ccp/modules/obds2fhir-rest-compose.yml b/ccp/modules/obds2fhir-rest-compose.yml index f201e23..833580d 100644 --- a/ccp/modules/obds2fhir-rest-compose.yml +++ b/ccp/modules/obds2fhir-rest-compose.yml @@ -10,7 +10,6 @@ services: SALT: ${LOCAL_SALT} KEEP_INTERNAL_ID: ${KEEP_INTERNAL_ID:-false} MAINZELLISTE_URL: ${PATIENTLIST_URL:-http://patientlist:8080/patientlist} - restart: always labels: - "traefik.enable=true" - "traefik.http.routers.obds2fhir-rest.rule=PathPrefix(`/obds2fhir-rest`) || PathPrefix(`/adt2fhir-rest`)" diff --git a/kr/modules/obds2fhir-rest-compose.yml b/kr/modules/obds2fhir-rest-compose.yml index f201e23..833580d 100644 --- a/kr/modules/obds2fhir-rest-compose.yml +++ b/kr/modules/obds2fhir-rest-compose.yml @@ -10,7 +10,6 @@ services: SALT: ${LOCAL_SALT} KEEP_INTERNAL_ID: ${KEEP_INTERNAL_ID:-false} MAINZELLISTE_URL: ${PATIENTLIST_URL:-http://patientlist:8080/patientlist} - restart: always labels: - "traefik.enable=true" - "traefik.http.routers.obds2fhir-rest.rule=PathPrefix(`/obds2fhir-rest`) || PathPrefix(`/adt2fhir-rest`)" diff --git a/minimal/modules/nngm-compose.yml b/minimal/modules/nngm-compose.yml index e61532d..8e42e71 100644 --- a/minimal/modules/nngm-compose.yml +++ b/minimal/modules/nngm-compose.yml @@ -11,7 +11,6 @@ services: CTS_API_KEY: ${NNGM_CTS_APIKEY} CRYPT_KEY: ${NNGM_CRYPTKEY} #CTS_MAGICPL_SITE: ${SITE_ID}TODO - restart: always labels: - "traefik.enable=true" - "traefik.http.routers.connector.rule=PathPrefix(`/nngm-connector`)" From 39a87bcf61ae3688c3ac9587c9cff0496046c782 Mon Sep 17 00:00:00 2001 From: patrickskowronekdkfz <86347677+patrickskowronekdkfz@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:28:47 +0100 Subject: [PATCH 2/4] Update: Blaze to version 0.31 (#260) --- bbmri/docker-compose.yml | 2 +- cce/docker-compose.yml | 2 +- ccp/docker-compose.yml | 2 +- ccp/modules/blaze-secondary-compose.yml | 2 +- dhki/docker-compose.yml | 2 +- itcc/docker-compose.yml | 2 +- kr/docker-compose.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 000df01..1903c62 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -4,7 +4,7 @@ version: "3.7" services: blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-bbmri-blaze environment: BASE_URL: "http://bridgehead-bbmri-blaze:8080" diff --git a/cce/docker-compose.yml b/cce/docker-compose.yml index 87b6b1c..0641af7 100644 --- a/cce/docker-compose.yml +++ b/cce/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-cce-blaze environment: BASE_URL: "http://bridgehead-cce-blaze:8080" diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index b7a71b2..871eec2 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-ccp-blaze environment: BASE_URL: "http://bridgehead-ccp-blaze:8080" diff --git a/ccp/modules/blaze-secondary-compose.yml b/ccp/modules/blaze-secondary-compose.yml index b57bfbe..ad748a6 100644 --- a/ccp/modules/blaze-secondary-compose.yml +++ b/ccp/modules/blaze-secondary-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: blaze-secondary: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-ccp-blaze-secondary environment: BASE_URL: "http://bridgehead-ccp-blaze-secondary:8080" diff --git a/dhki/docker-compose.yml b/dhki/docker-compose.yml index ee8cd17..d37f1a2 100644 --- a/dhki/docker-compose.yml +++ b/dhki/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-dhki-blaze environment: BASE_URL: "http://bridgehead-dhki-blaze:8080" diff --git a/itcc/docker-compose.yml b/itcc/docker-compose.yml index 7aab26d..c9bce0c 100644 --- a/itcc/docker-compose.yml +++ b/itcc/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-itcc-blaze environment: BASE_URL: "http://bridgehead-itcc-blaze:8080" diff --git a/kr/docker-compose.yml b/kr/docker-compose.yml index 47a9db6..17b36b7 100644 --- a/kr/docker-compose.yml +++ b/kr/docker-compose.yml @@ -6,7 +6,7 @@ services: replicas: 0 #deactivate landing page blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + image: docker.verbis.dkfz.de/cache/samply/blaze:0.31 container_name: bridgehead-kr-blaze environment: BASE_URL: "http://bridgehead-kr-blaze:8080" From 138a1fa5f116567cf1ee11da42ffd4b662ee43d5 Mon Sep 17 00:00:00 2001 From: patrickskowronekdkfz <86347677+patrickskowronekdkfz@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:30:20 +0100 Subject: [PATCH 3/4] fix: changed ccp_ppi to use IDMANAGEMENT_FRIENDLY_ID instead of SITE_NAME (#259) --- ccp/modules/id-management-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccp/modules/id-management-compose.yml b/ccp/modules/id-management-compose.yml index b7c3f61..4e3e90a 100644 --- a/ccp/modules/id-management-compose.yml +++ b/ccp/modules/id-management-compose.yml @@ -106,7 +106,7 @@ services: container_name: bridgehead-ccp-patient-project-identificator environment: MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY} - SITE_NAME: ${SITE_NAME} + SITE_NAME: ${IDMANAGEMENT_FRIENDLY_ID} volumes: patientlist-db-data: From 6a71da3dd1868132d6c802d4eac8a192aa621de3 Mon Sep 17 00:00:00 2001 From: patrickskowronekdkfz <86347677+patrickskowronekdkfz@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:35:25 +0100 Subject: [PATCH 4/4] docs: documentation for changing your configuration repository access token (#256) --- README.md | 2 ++ docs/update-access-token.md | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 docs/update-access-token.md diff --git a/README.md b/README.md index 3c36053..b7e60ad 100644 --- a/README.md +++ b/README.md @@ -254,6 +254,8 @@ sh bridgehead uninstall ## Site-specific configuration +[How to Change Config Access Token](docs/update-access-token.md) + ### HTTPS Access Even within your internal network, the Bridgehead enforces HTTPS for all services. During the installation, a self-signed, long-lived certificate was created for you. To increase security, you can simply replace the files under `/etc/bridgehead/traefik-tls` with ones from established certification authorities such as [Let's Encrypt](https://letsencrypt.org) or [DFN-AAI](https://www.aai.dfn.de). diff --git a/docs/update-access-token.md b/docs/update-access-token.md new file mode 100644 index 0000000..d608d45 --- /dev/null +++ b/docs/update-access-token.md @@ -0,0 +1,42 @@ +## How to Change Config Access Token + +### 1. Generate a New Access Token + +1. Go to your Git configuration repository provider, it might be either [git.verbis.dkfz.de](https://git.verbis.dkfz.de) or [gitlab.bbmri-eric.eu](https://gitlab.bbmri-eric.eu). +2. Navigate to the configuration repository for your site. +3. Go to **Settings → Access Tokens** to check if your Access Token is valid or expired. + - **If expired**, create a new Access Token. +4. Configure the new Access Token with the following settings: + - **Expiration date**: One year from today, minus one day. + - **Role**: Developer. + - **Scope**: Only `read_repository`. +5. Save the newly generated Access Token in a secure location. + +--- + +### 2. Replace the Old Access Token + +1. Navigate to `/etc/bridgehead` in your system. +2. Run the following command to retrieve the current Git remote URL: + ```bash + git remote get-url origin + ``` + Example output: + ``` + https://name40dkfz-heidelberg.de:@git.verbis.dkfz.de/bbmri-bridgehead-configs/test.git + ``` +3. Replace `` with your new Access Token in the URL. +4. Set the updated URL using the following command: + ```bash + git remote set-url origin https://name40dkfz-heidelberg.de:@git.verbis.dkfz.de/bbmri-bridgehead-configs/test.git + + ``` + +5. Start the Bridgehead update service by running: + ```bash + systemctl start bridgehead-update@ + ``` +6. View the output to ensure the update process is successful: + ```bash + journalctl -u bridgehead-update@ -f + ``` \ No newline at end of file