Commit Graph

361 Commits

Author SHA1 Message Date
Tobias Kussel aac31945a3 Add dnpm echo to dnpm-compose 2024-02-19 08:50:15 +00:00
Martin Lablans 60b2bddf15
Merge pull request #146 from samply/fix/updates
Fix image updates for image names with vars
2024-02-14 16:37:28 +01:00
janskiba 001b84a774 Revert "Merge pull request #147 from samply/fix/set-focus-version-to-main"
This reverts commit 6550c0cdab, reversing
changes made to 40d991d94e.
2024-02-12 08:55:29 +00:00
Martin Lablans 44ac09b9c1 Bump postgres version to 15.6 2024-02-09 16:58:02 +01:00
Torben Brenner 2d5b6e6932
fix: set focus version to main 2024-02-08 12:30:42 +01:00
Enola Knezevic ae02526baf
Merge pull request #142 from samply/addTestInstancesForBbmri
Tested for test GBN and ERIC BHs
2024-01-16 13:03:12 +01:00
Martin Lablans ea51fc5910
Hotfix Pierre: Use version 1.0.0 for MTBA 2024-01-09 11:32:01 +01:00
Martin Lablans 29fb0e7099 Use focus tag depending on ENVIRONMENT 2024-01-08 15:49:46 +01:00
Tobias Kussel a80a980cea
Merge pull request #140 from samply/feature/dnpm-node
Feature/dnpm node
2023-12-18 10:53:39 +01:00
Tobias Kussel f66f2755d8 Change landing page path override to /landing 2023-12-15 13:32:00 +00:00
Tobias Kussel c02da838c7 Cleanup dnpm connect module 2023-12-15 09:41:11 +00:00
Tobias Kussel 459fa7f78e Add DNPM Node feature to minimal 2023-12-15 09:24:06 +00:00
Pierre Delpy 9bf1b42003
set mtba image to latest 2023-11-30 14:58:54 +01:00
juarez 2ba9645ab4 Bugfix: MTBA 1.0.0 2023-11-30 12:29:58 +01:00
Tobias Kussel 2252504d78 add bwhc node module 2023-11-03 07:33:16 +00:00
Tobias Kussel 6bf34b7732 Enable obfuscation for ccp queries 2023-11-02 07:34:56 +00:00
p.delpy@dkfz-heidelberg.de 0555786435 fix bash logic 2023-10-24 07:42:27 +02:00
p.delpy@dkfz-heidelberg.de 262b9bd62e add adt2fhir-rest service 2023-10-24 07:30:17 +02:00
Torben Brenner 850a8eb973 chore: update postgres from 15.1 to 15.4 2023-09-18 15:06:00 +02:00
Tobias Kussel 169ce2436f fix dnpm connect env, from bool to string 2023-08-28 17:21:52 +00:00
Tobias Kussel bba8a03f9f Use beam-connect:develop for DNPM 2023-08-24 12:22:43 +00:00
Patrick Skowronek fa973e2cfa fix: path in mtba setup 2023-08-16 09:37:30 +02:00
Patrick Skowronek bbda5e917f Cleanup 2023-08-16 09:35:36 +02:00
Torben Brenner e69c0ec306 Merge branch 'main' into dktk-migration 2023-08-16 09:14:04 +02:00
Pierre Delpy 829102f23e
Merge branch 'main' into feature/custom-basic-auth 2023-08-15 14:24:19 +02:00
p.delpy@dkfz-heidelberg.de dc0fc286b1 add generic bash function addBasicAuthUser 2023-08-08 09:28:59 +02:00
Martin Lablans 54d83736c3 Move BBMRI-ERIC, GBN to modules 2023-08-07 15:19:41 +02:00
p.delpy@dkfz-heidelberg.de 788e4ea9f7 add generic bash function addBasicAuthUser 2023-07-27 13:53:20 +02:00
Martin Lablans 6ad91edefb
Don't run Blaze in debug mode 2023-07-27 09:37:19 +02:00
Torben Brenner 0a12720e4c fix: ensure id-management redirects with ssl 2023-07-25 13:27:21 +02:00
Patrick Skowronek 11db7e2be9 Remove ref to report-hub 2023-06-30 13:36:42 +02:00
Patrick Skowronek 3dec0a7178 Remove EXLIQUID 2023-06-30 13:31:11 +02:00
Patrick Skowronek 9ca3e0059e Rmoved generated of report-hub secret 2023-06-30 12:33:34 +02:00
Patrick Skowronek 512f335da8 Removed Report-Hub env var 2023-06-30 12:32:25 +02:00
Patrick Skowronek f510275685 Deleted EXLIQUID setup + compose 2023-06-30 12:30:19 +02:00
Tobias Kussel 6288f809fb Merge branch 'main' into dktk-migration 2023-06-30 09:02:37 +00:00
Tobias Kussel dd0c28daf3 Add new dktk root cert 2023-06-30 07:50:18 +00:00
Tobias Kussel 6d94ebd4eb Add path stripper 2023-06-30 06:02:32 +00:00
Tobias Kussel a033386464 Absolute path for beam root cert 2023-06-28 15:38:05 +02:00
Tobias Kussel 9f4523cf9e Absolute path for beam root cert 2023-06-28 14:55:35 +02:00
Tobias Kussel 7b32eed493 Merge branch 'main' into dktk-migration 2023-06-28 13:58:18 +02:00
Tobias Kussel f0d423fcf7 Adapt to new beam app syntax 2023-06-28 11:48:47 +02:00
Tobias Kussel 3304d2818d Merge branch 'main' into feature/dnpm-connect 2023-06-28 11:45:45 +02:00
Tobias Kussel 499360712b
Merge pull request #83 from samply/update/blaze-20
Change blaze tag to latest
2023-06-28 11:43:57 +02:00
Tobias Kussel 37ed5f5cd9
Merge pull request #88 from samply/new-beam-apikey-naming
New beam-proxy api key syntax
2023-06-28 11:34:06 +02:00
Martin Lablans 097de41652 focus: Rename SECRET to API_KEY 2023-06-19 15:45:06 +02:00
Martin Lablans 23a500aae9 focus: Rename SECRET to API_KEY 2023-06-19 13:33:26 +02:00
Martin Lablans b1ee2fa5f4 New beam-proxy api key syntax 2023-06-19 13:25:22 +02:00
Enola 6cbf7915f0
Merge pull request #87 from samply/main
Merge Focus als Spot replacment from main
2023-06-19 13:21:26 +02:00
Enola Knezevic 5642141f3f CCP focus develop -> main 2023-06-19 10:32:39 +02:00
Pierre Delpy 149a550940 deactivate exliquid in freiburg 2023-06-19 07:24:39 +02:00
Enola Knezevic 9dadd3efa0 variables 2023-06-16 16:28:22 +02:00
Enola Knezevic c41ebd226d DKTK local spot -> focus 🥳 2023-06-16 16:24:48 +02:00
p.delpy@dkfz-heidelberg.de 019304862e make ID Management skippable for MTBA 2023-06-15 11:02:59 +02:00
Tobias Kussel 71fea9f098 Switch to new dktk broker url with new root cert 2023-06-13 06:16:00 +00:00
Tobias Kussel ff4fb06ad1 Address review comments 2023-05-19 11:53:03 +00:00
Tobias Kussel a18b63e190 Use cached beam-connect image for dnpm 2023-05-17 10:04:35 +00:00
Tobias Kussel f4134bcfca Remove DNPM-BwHC experiment 2023-05-17 09:26:55 +00:00
Tobias Kussel 4e7f023b8a Clean up bwhc startup 2023-05-16 10:56:28 +00:00
Patrick Skowronek 2de6504832 Change blaze tag to latest 2023-05-16 11:57:27 +02:00
Tobias Kussel 187945b27e Merge remote-tracking branch 'origin/main' into feature/dnpm-connect 2023-05-16 09:25:08 +00:00
Tobias Kussel c9806ad874 Adapt DNPM configuration 2023-05-15 13:43:01 +02:00
Tobias Kussel 498092d36a Replace deprecated openssl command 2023-05-10 10:59:13 +00:00
Tobias Kussel 3e1659a38d Modularize DNPM components 2023-05-10 10:54:05 +00:00
p.delpy@dkfz-heidelberg.de dd0d2c64fd nngm migration from connector to nngm-rest 2023-05-09 07:55:30 +02:00
Tobias Kussel 503f39820b Merge branch 'main' into dnpmconnector 2023-04-04 13:02:49 +02:00
Martin Lablans 33b50372c6 Pull docker images from DKFZ mirror 2023-03-09 11:16:34 +01:00
Patrick Skowronek fdda14c1be Fixed naming of site in exliquid script 2023-02-23 14:26:59 +01:00
Martin Lablans 90773ea92a Switch beam images to develop tag 2023-02-21 09:26:53 +01:00
Pierre Delpy e4ac27061a
Merge pull request #57 from samply/feature/idManagementModule
Added Module for Id-Management
2023-02-09 10:22:30 +01:00
Torben Brenner 5a7dd1d0ae fix: Use Mapped Site Id in Patientlist 2023-02-09 10:07:05 +01:00
Torben Brenner 64095ac8dd feat: Added Upload ApiKey to Patientlist 2023-02-09 09:15:29 +01:00
Torben Brenner d728ccd886 refactor: Fixated Postgres Version to 15.1
All Minor Updates will cause a crashing postgres on start
2023-02-08 15:02:35 +01:00
Torben Brenner c88919c926 feature: Ensured the mapping to legacy ids works 2023-02-08 14:42:52 +01:00
p.delpy@dkfz-heidelberg.de e9455a5558 update mtba config 2023-02-07 16:39:43 +01:00
p.delpy@dkfz-heidelberg.de bce28342f9 update docker and host paths 2023-02-07 16:33:29 +01:00
Torben Brenner e2d90447f7 refactor: Changed Trigger of the IDM Module 2023-02-07 16:31:58 +01:00
Torben Brenner a3ba98a2fd Added Configuration for Local ID-Management 2023-02-07 16:31:58 +01:00
Torben Brenner 2445a59785 refacotr: Restructured passing Patientlist Seeds 2023-02-07 16:26:07 +01:00
Torben Brenner 17d48a3636 refactor: Expect User to select a Backup Directory 2023-02-07 16:23:49 +01:00
Torben Brenner 1befa65f35 refactor: Changed Salt for patientlist db password 2023-02-07 16:23:18 +01:00
Torben Brenner 0d998ab871 refactor: Move persistent data to named volumes 2023-02-07 16:23:18 +01:00
Torben Brenner 1c3fa4fa3f refactor: Changed Paths for persistent Data 2023-02-07 16:22:28 +01:00
Martin Lablans 6d8e877899 Use beam-proxy "main" tag 2023-02-03 13:28:44 +01:00
Patrick Skowronek eb37d16b84 Updated Blaze to 0.19 2023-01-31 15:44:30 +01:00
Martin Lablans 4efe356005 Made it even easier for sites 2023-01-19 10:15:12 +00:00
Martin Lablans af7960e036 Improve documentation 2023-01-19 10:05:03 +00:00
p.delpy@dkfz-heidelberg.de e7b238de9d set magicpl instead of patientlist 2023-01-12 08:26:49 +01:00
p.delpy@dkfz-heidelberg.de e0c9a5ced3 Added MTBA Module 2023-01-12 08:26:49 +01:00
Torben Brenner 4d49351ad2 fix: Included Legacy ID-Mapping (Please Complete) 2023-01-12 08:26:49 +01:00
Torben Brenner 4f0526ddf4 docs: Added Documentation for the IDM Module 2023-01-12 08:26:49 +01:00
Torben Brenner 2a46bd00fd refactor: Changed Trigger of the IDM Module 2023-01-12 08:26:49 +01:00
Torben Brenner 1ffc9b9cd5 feature: Added automated Backups for PostgreSQL 2023-01-12 08:26:49 +01:00
Torben Brenner 6d24dbce7f Added Configuration for Local ID-Management 2023-01-12 08:26:49 +01:00
Patrick Skowronek c9bb317cd2 Fixed vars in exliquid compose 2023-01-04 14:00:08 +01:00
Patrick Skowronek 813dbcc76a Fixed beam proxy var url 2022-12-12 10:41:18 +01:00
Patrick Skowronek 54fbb58f0d Added proxy base url 2022-12-12 09:27:50 +01:00
Patrick Skowronek 66999178bf Added space to Override 2022-12-12 09:22:20 +01:00
patrickskowronekdkfz d8db3bee6d
Merge pull request #46 from samply/feature/addReportHub
Feature/add report hub
2022-12-12 08:51:29 +01:00
Martin Lablans af54f0ca04 Define exliquid sites right inside the common bridgehead scripts 2022-12-06 11:42:18 +01:00
Martin Lablans ece0dec9c9 Rename exliquid docker containers 2022-12-06 11:33:45 +01:00
Patrick Skowronek b061bf6350 Fixed compose file for exliquid 2022-12-05 13:18:14 +01:00
Torben Brenner 6297373ed0 refactor: Removed Debug Logging from Beam Proxy 2022-11-25 09:22:17 +01:00
Martin Lablans f359e06875 Encryption: Add root certs for CCP, BBMRI 2022-11-22 14:24:56 +01:00
Martin Lablans 23aa8f8274
Extra space for nngm compose 2022-11-08 10:54:51 +01:00
Martin Lablans bece71441c Support DNPM 2022-11-08 10:39:11 +01:00
Martin Lablans 038d8d69f6 Make LDM password nicer 2022-11-03 17:19:15 +01:00
Torben Brenner ce386f5a2a fix: Moved LDM Password to /etc/bridgehead 2022-11-03 09:14:44 +01:00
Pierre Delpy 5af65800b9
Merge pull request #28 from samply/hotfix/nngm
add consistent CONNECTOR_POSTGRES_PASSWORD
2022-11-02 10:04:41 +01:00
p.delpy@dkfz-heidelberg.de b232fdb926 remove http ports 2022-11-02 09:30:57 +01:00
Patrick Skowronek fc3198d22c Fixed task store base url 2022-10-31 15:30:32 +01:00
Patrick Skowronek 3f5463318d Fixed labels 2022-10-31 11:26:00 +01:00
Patrick Skowronek c6a807d717 Added Report Hub for EXLIQUID 2022-10-31 08:26:25 +01:00
Martin Lablans cfdcb8af86 Don't expose bridgehead http(s) services by default. 2022-10-28 11:53:50 +02:00
Martin Lablans 0dae36c9d9 Reconcile BBMRI/CCP traefik configs. 2022-10-28 11:41:15 +02:00
Martin Lablans ef2965f72f Make traefik use certificates at /etc/bridgehead/traefik-tls 2022-10-28 11:37:49 +02:00
Martin Lablans 0cba5d315a Sign, not encrypt, to avoid openssl salt 2022-10-28 10:37:51 +02:00
Martin Lablans 3a668a1cce Generate consistent nNGM Connector password 2022-10-28 10:26:17 +02:00
PierreDelpy 5c65ae9638 add port quick solution for ssl cert verification with portnumber; genereate persistent connector password 2022-10-26 14:33:38 +00:00
Martin Lablans 404e5440b8 Support nngm within CCP bridgehead 2022-10-26 11:50:21 +02:00
Martin Lablans 428f7293e6
Merge branch 'feature/samplyBeam' into fix/proxyFix 2022-10-24 15:23:27 +02:00
Martin Lablans 9658f6ed2e Fix traefik cert 2022-10-17 15:21:12 +02:00
Martin Lablans f8b9aed7f5 Cleaning 2022-10-17 15:09:18 +02:00
Martin Lablans e273e97d9c
Certificate enrollment (#24) 2022-10-17 14:38:34 +02:00
Martin Lablans 0f1cb966ba
Use tag latest for forward proxy 2022-10-11 18:36:42 +02:00
Martin Lablans 7ecb39d6ce Use new forward proxy 2022-10-11 18:29:08 +02:00
Martin Lablans e439510920 Rename spot container so it shows up in monitoring 2022-10-11 13:29:09 +02:00
Martin Lablans f7742f2a2b Make traefik volumes read-only 2022-10-11 13:28:51 +02:00
Torben Brenner bba1041bed
Updated Blaze from v0.17 -> v0.18 2022-10-05 12:52:39 +02:00
Martin Lablans 69b33941c4 Derive spot variables 2022-09-30 16:05:36 +02:00
Torben Brenner 4c84d65548 refactor: Use Proxy from Site Config 2022-09-30 14:20:37 +02:00
Torben Brenner ab7565b150 fix: Switched Spot to Docker Hub Image 2022-09-29 16:33:50 +02:00
Torben Brenner b95357570c fix: Added All Proxy in Beam 2022-09-29 16:31:35 +02:00
Torben Brenner f4f33b95fc fix: Added Traefik Certificate Specification 2022-09-26 10:52:21 +02:00
Patrick Skowronek 93f0551ac6 Fix ref 2022-09-08 10:25:18 +02:00
Patrick Skowronek c8fc961321 At the right point now 2022-09-08 10:24:25 +02:00
Patrick Skowronek cd7257b295 Added real image 2022-09-08 10:23:07 +02:00
Patrick Skowronek 1050d413cd Added more Debug loging 2022-09-08 09:33:03 +02:00
Patrick Skowronek 4ef896c3f2 Replaced forward proxy with site proxy 2022-09-07 15:26:01 +02:00
Patrick Skowronek 5c2c76e759 Added WIP spot and beam proxy 2022-09-07 11:09:53 +02:00
Torben Brenner 33ffecb3a2 feat: WIP! Added Samply Beam and Spot to CCP 2022-09-05 16:01:56 +02:00
Patrick Skowronek 65c30708b8 Updated forward proxy version 2022-06-13 12:40:41 +02:00
Patrick Skowronek f75218fbe4 Fixed Typo in share-client proxy settings 2022-06-13 12:39:27 +02:00
Patrick Skowronek 986dd133bd Removed extra-host in ccp, needs to readded later 2022-05-17 14:03:38 +02:00
Patrick Skowronek 5cf289f4ee Fixed postgres user 2022-05-17 10:57:32 +02:00
Martin Lablans a6a7a3aa99 Make Share use proxy server. 2022-05-13 14:48:26 +02:00
Patrick Skowronek 1928713b9d Fixed naming
Update the git config repo
2022-05-11 10:30:18 +02:00
Patrick Skowronek 8da8a7933a Correct link to docker images 2022-05-11 09:05:23 +02:00
Patrick Skowronek 25cee2ff5b Merge branch 'version-1' into feature/landingpage-as-container 2022-05-10 14:00:58 +02:00
Martin Lablans edc3085dca New landingpage. 2022-05-10 11:52:38 +02:00
Patrick Skowronek d092d28980 Merge branch 'version-1' into martinsFixes 2022-05-10 09:16:47 +02:00
Patrick Skowronek acd6b94df6 Use correct link to dockerhub 2022-05-10 09:09:58 +02:00
Martin Lablans 334f82661b Housekeeping and script hardening in /srv/docker/bridgehead. Existing installations need to run bridgehead uninstall, bridgehead install. 2022-05-09 15:13:38 +02:00
Patrick Skowronek fb583b474c Added correct version of traefik 2022-05-09 13:52:20 +02:00
Patrick Skowronek dc8b8b3339 Some fixes after review with Martin 2022-05-09 12:57:24 +02:00
Patrick Skowronek 445add6d30 Updated gbn docker-compose 2022-05-09 08:09:14 +02:00
Patrick Skowronek f159ea8c3c Fixed some merge issues 2022-05-05 08:52:09 +02:00
root cfceb6d435 Cleanup of earlier merge 2022-05-04 13:50:33 +02:00
root 03d1a83439 Removed hacky solution for central components 2022-05-03 15:50:38 +02:00
root 63b279617b Some more improvements for deployment 2022-05-03 09:16:19 +02:00
root 8c5e8ed833 Cleanup of old files
Moved c4 and dktk to ccp
2022-05-02 16:19:17 +02:00