Commit Graph

52 Commits

Author SHA1 Message Date
David Croft
2bea154151 Got rid of the ^Ms at the end of the lines in these files 2025-04-30 14:40:39 +02:00
David Croft
5e621641ae Control import from Directory, improve README
Two new environment variables have been introduced, to allow a user to control
which data (if any) is imported from the Directory during a sync operation.
This was considered necessary, because recent changes to Directory sync have
greatly expanded the data that can be imported.

This was documented in the README, and the oportunity was taken to improve the
existing documentation, especially by peoviding a list of all available
environment variables for Directory sync.
2025-04-30 14:16:56 +02:00
Enola Knezevic
eea17c3478 fix: remove invalid beam-proxy tag and add it to focus instead (#242) 2024-10-22 16:48:48 +02:00
Pierre Delpy
cf5230963c feat: add focus tags in ccp and bbmri (#240)
Co-authored-by: p.delpy@dkfz-heidelberg.de <p.delpy@dkfz-heidelberg.de>
2024-10-21 11:00:01 +02:00
Pierre Delpy
c585322ee7 Merge pull request #226 from samply/main
Update Develop from Main
2024-09-12 08:22:17 +02:00
lablans
18c9e1bb30 Remove DP statement already present in readme. 2024-08-15 11:43:14 +00:00
lablans
de847f309c Provide defaults 2024-08-15 11:40:44 +00:00
DavidCroftDKFZ
3496fa7a0f Let Directory sync handle connection with Blaze
Remove the delayed start, because Directory sync will automatically keep trying to
connect to Blaze if not initially present.
2024-08-15 13:36:57 +02:00
DavidCroftDKFZ
95574f38be Included Blaze dependency 2024-08-15 10:33:28 +02:00
DavidCroftDKFZ
b8b81b1242 Fixed environment variable passing for Directory sync
There were problems with the passing of environment variables from
bbmri.conf to the Directory synce container:

* The Directory password variable was misspellt.
* Some useful variables were missing.

Additionally, a delay was added before launching Directory sync,
to give Blaze time to start up.
2024-08-15 09:17:34 +02:00
Martin Lablans
4ab10ff71d In ENVIRONMENT=production, use main tag for Samply.Beam. 2024-07-29 13:50:30 +02:00
DavidCroftDKFZ
8942b923b3 Added comment for consistency with Directory Sync README 2024-07-26 09:57:40 +02:00
DavidCroftDKFZ
3f8bb158bc Merge branch 'main' into main_directory_sync_extra_attributes_and_star_model 2024-07-25 16:54:47 +02:00
patrickskowronekdkfz
fe3fc6204a Revert "GBN maintenance mode" 2024-04-18 11:01:04 +02:00
Patrick Skowronek
1afbf88a76 fix: use only bbmri broker 2024-04-16 09:23:42 +02:00
Patrick Skowronek
94b2c29bc7 GBN maintenance mode 2024-04-15 08:31:57 +02:00
djuarezgf
480bbe04e7 Changed: TEILER_DEFAULT_LANGUAGE 2024-03-18 16:47:40 +01:00
Croft
8104711075 Allow user to push star model facts to Directory
This takes advantage of new functionality added to Directory sync.

Defaults to false.
2024-03-06 11:26:07 +01:00
juarez
dcddbf2235 Bugfix: Add version of docker-compose 2024-02-27 12:44:26 +01:00
juarez
e182e2fbe6 Remove unnecessary version of docker-compose.override files 2024-02-27 12:43:23 +01:00
Martin Lablans
f367a406bb Remove DNPM code from BBMRI 2024-02-20 10:47:42 +01:00
Tobias Kussel
aac31945a3 Add dnpm echo to dnpm-compose 2024-02-19 08:50:15 +00:00
Martin Lablans
5ba1a1a820 Fix variable visibility 2024-01-09 11:47:02 +01:00
Patrick Skowronek
c4018aae08 fixed gbn broker url 2024-01-09 07:53:44 +01:00
Enola Knezevic
417c158435 GBN broker IDs 2024-01-08 16:26:07 +01:00
Enola Knezevic
00030a6141 GBN variable names 2024-01-08 16:15:46 +01:00
Martin Lablans
29fb0e7099 Use focus tag depending on ENVIRONMENT 2024-01-08 15:49:46 +01:00
Martin Lablans
00cae67fa1 Add missing switch-case for gbn 2024-01-08 15:49:28 +01:00
Martin Lablans
2074461ee7 Use new variable ENVIRONMENT in /etc/bridgehead; defaults to "production". 2024-01-08 13:03:12 +01:00
Patrick Skowronek
954d46efb1 Added test root certs and logic for beam to use test brokers 2024-01-05 11:58:42 +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
d28a3ac889 Add dnpm node module to bbmri project 2023-12-15 09:46:40 +00:00
Tobias Kussel
c02da838c7 Cleanup dnpm connect module 2023-12-15 09:41:11 +00:00
patrickskowronekdkfz
6b1ea4c74e Update gbn-setup.sh 2023-09-04 15:54:22 +02:00
Patrick Skowronek
8c8ebb9298 Added gbn broker url and e-mail 2023-09-04 15:30:44 +02:00
patrickskowronekdkfz
0536023ceb Merge pull request #117 from samply/feature/bbmri_de
Added broker.bbmri.de root cert
2023-09-04 14:44:38 +02:00
Patrick Skowronek
3a3a9d09a9 Added broker.bbmri.de root cert 2023-09-04 14:30:52 +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
Martin Lablans
54d83736c3 Move BBMRI-ERIC, GBN to modules 2023-08-07 15:19:41 +02:00
Martin Lablans
b32a19a7b5 Make Directory Sync a module 2023-08-07 13:00:24 +02: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
f0d423fcf7 Adapt to new beam app syntax 2023-06-28 11:48:47 +02:00
Tobias Kussel
f02587d9fa Change DNPM broker id 2023-05-25 11:20:18 +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