Pin the landing page to a version known to work

Added ECDC Beam Broker site to list of Firewall exceptions
Removed misleading text from stop.sh
2025-06-16 15:00:15 +02:00 · 2024-08-29 15:05:39 +02:00 · 2024-07-26 09:49:13 +02:00 · 2024-07-18 12:56:42 +02:00 · 2024-07-18 12:31:42 +02:00 · 2024-07-17 09:34:46 +02:00
4 changed files with 42 additions and 42 deletions
--- a/bbmri/modules/ehds2-setup.sh
+++ b/bbmri/modules/ehds2-setup.sh
@ -7,16 +7,16 @@ if [ "${ENABLE_EHDS2}" == "true" ]; then
 	# The environment needs to be defined in /etc/bridgehead
 	case "$ENVIRONMENT" in
 		"production")
-			export EHDS2_BROKER_ID=ecdc-vm-ehds-test1.swedencentral.cloudapp.azure.com
+			export EHDS2_BROKER_ID=broker.bbmri.samply.de
 			export EHDS2_ROOT_CERT=ehds2
 			;;
 		"test")
-			export EHDS2_BROKER_ID=ecdc-vm-ehds-test1.swedencentral.cloudapp.azure.com
+			export EHDS2_BROKER_ID=broker.test.bbmri.samply.de
 			export EHDS2_ROOT_CERT=ehds2.test
 			;;
 		*)
 			report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!"
-			export EHDS2_BROKER_ID=ecdc-vm-ehds-test1.swedencentral.cloudapp.azure.com
+			export EHDS2_BROKER_ID=broker.bbmri.samply.de
 			export EHDS2_ROOT_CERT=ehds2
 			;;
 	esac
--- a/bbmri/modules/ehds2.root.crt.pem
+++ b/bbmri/modules/ehds2.root.crt.pem
@ -1,22 +1,22 @@
-# EHDS2/ECDC certificate
+# DKFZ certificate
 -----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUamQJB/Uevzf3+qrDQOqA8mwkwX8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjQwMjA3MTQ1MTQxWhcNMzQw
-MjA0MTQ1MjExWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKvI2XT0os20vG7d8FjRuMq9mALcQgLZvjAbQZbm
-JyeVxRQP5HsSrBlBwaZWgmXWFfIPlwsEsTAUsCneAl4ZL3gQ6831nbmmpgThOEVy
-rGBsbL6qlEWWplD/AGpcdEbAuDmuMSO9tKR6iRm+acTHJcXqsDm2HUUS7U+ManWY
-S0dG10beJE2eVtEv5/fnFlVSn72VgAVgXVl7UA5E77zXK9GUAyQ6Oo7MET9zifZ/
-EifeSoEvLk+U7HRLgQbKz2ti6ABh0wnK7Ec2DjekMBXyeQz0tR+8dS53s5pqti7c
-SUQMHmL4jKxvfQr7fr5wbJpFDu37Vif9GdND9WSDRcufuM8CAwEAAaN7MHkwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKMF6QgDV4cV
-WyQZn3EHKLUumXzuMB8GA1UdIwQYMBaAFKMF6QgDV4cVWyQZn3EHKLUumXzuMBYG
-A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQAhhE0ht7Sp
-inKLJSVZrdFHbAbRXnYcUz/3oyy/uw0YvF0dJAHz2sgbtCLMHzKU7NwotaEqZedA
-I7688nI42aHggIkwa1CzmFo9ybQ2afgrYNeF+TcTQI6G+fFpeRT5I+FvA9hUI3r4
-Kp63Si7cpQS5uiHs90sv2SNMedo2Gf9VyJKB7NOReQJWsrw32ITi4QLNKHcHciKm
-cpi/OqbR1YTJRoUrcC655G7bSKENzccdTWo8kBJgYLVbe+FohqgheqPqWpdH2zoR
-OxOwviutfJTNvDyhXu8FrDc5tr9f5VjXv1hK2szYuvggwbybUBB9bLsx+fV79oZe
-3zR0j5YwB28G
+MIIDNTCCAh2gAwIBAgIUMy/n0zFRihhVR3aAD54LumzeYdwwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjIxMDI1MDczNTA4WhcNMzIx
+MDIyMDczNTM3WjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL3qWliHIlIT1Qlsyq/NKJ1uj6/AF0STNg5NTNpb
+Xqe5rmUqs6jmQepputGStBVe5TthFw56whISv9FqD5s1PZUGyFikW1pJUnF7ZYRf
+MfrJHRi1vUnD3Gw36FCot+i6BAxfw/rdp9hoqFZ6erRkULLaYZ5S2cDHN0DWc18V
+3VgZ66ah8QXSx7ERRNa/eWRkHrPIYhyVSoKuyZfvbVgsYZADSlviCgIHPrGLerLr
+ylNUyuTxJ5RKStOwPn7A+Jp7nRT+MRh9BphA7s6NuK9h+eVe1DiLbIETWyCEfN3Y
+INpunatn3QDhqOIfNcuBArjsAj7mg8l5KNba8nUP4v0EJYECAwEAAaN7MHkwDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMvc5Fizz1vO
+MEG3MIsy7UY69ZNIMB8GA1UdIwQYMBaAFMvc5Fizz1vOMEG3MIsy7UY69ZNIMBYG
+A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQBb8a5su820
+h8JStJC+KpvXmDrGkwx9bHlEZMgQQejIrwPLEbA32KBvNxdoUxF9q1Y773MKdqbc
+cCJwzQXE/NPZ13hCGrEIXs8DgH52GhEB5592k5/bRNcAvUwbZSXPPiT0rgq/eUOt
+BYhgN0ov7h1MC5L6CYB/rQwqck7JPlmrXTkh2gix4/dEdBRzsHsn/xlo8ay5QYHG
+rx2Adit76eZu/MJoJNzl1r8MPxLqyAie3KcIU54A+UMozLrWEQP/TyOyWZdjUjJt
+cBYgkKJTjwdRhc+ehI3kFo7b/a/Z/jl9szKsAPHozMixSi8lGnsYwN80oqeRvT7h
+wcMUK+igv3/K
 -----END CERTIFICATE-----

--- a/bbmri/modules/ehds2.test.root.crt.pem
+++ b/bbmri/modules/ehds2.test.root.crt.pem
@ -1,22 +1,22 @@
-# EHDS2/ECDC certificate
+# DKFZ certificate
 -----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUamQJB/Uevzf3+qrDQOqA8mwkwX8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjQwMjA3MTQ1MTQxWhcNMzQw
-MjA0MTQ1MjExWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKvI2XT0os20vG7d8FjRuMq9mALcQgLZvjAbQZbm
-JyeVxRQP5HsSrBlBwaZWgmXWFfIPlwsEsTAUsCneAl4ZL3gQ6831nbmmpgThOEVy
-rGBsbL6qlEWWplD/AGpcdEbAuDmuMSO9tKR6iRm+acTHJcXqsDm2HUUS7U+ManWY
-S0dG10beJE2eVtEv5/fnFlVSn72VgAVgXVl7UA5E77zXK9GUAyQ6Oo7MET9zifZ/
-EifeSoEvLk+U7HRLgQbKz2ti6ABh0wnK7Ec2DjekMBXyeQz0tR+8dS53s5pqti7c
-SUQMHmL4jKxvfQr7fr5wbJpFDu37Vif9GdND9WSDRcufuM8CAwEAAaN7MHkwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKMF6QgDV4cV
-WyQZn3EHKLUumXzuMB8GA1UdIwQYMBaAFKMF6QgDV4cVWyQZn3EHKLUumXzuMBYG
-A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQAhhE0ht7Sp
-inKLJSVZrdFHbAbRXnYcUz/3oyy/uw0YvF0dJAHz2sgbtCLMHzKU7NwotaEqZedA
-I7688nI42aHggIkwa1CzmFo9ybQ2afgrYNeF+TcTQI6G+fFpeRT5I+FvA9hUI3r4
-Kp63Si7cpQS5uiHs90sv2SNMedo2Gf9VyJKB7NOReQJWsrw32ITi4QLNKHcHciKm
-cpi/OqbR1YTJRoUrcC655G7bSKENzccdTWo8kBJgYLVbe+FohqgheqPqWpdH2zoR
-OxOwviutfJTNvDyhXu8FrDc5tr9f5VjXv1hK2szYuvggwbybUBB9bLsx+fV79oZe
-3zR0j5YwB28G
+MIIDNTCCAh2gAwIBAgIUJ0g7k2vrdAwNTU38S1/mU8NO26MwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjMwNzEwMTIyMzQxWhcNMzMw
+NzA3MTIyNDExWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALMvc/fApbsAl+/NXDszNgffNR5llAb9CfxzdnRn
+ryoBqZdPevBYZZfKBARRKjFbXRDdPWbE7erDeo1LiCM6PObXCuT9wmGWJtvfkmqW
+3Z/a75e4r360kceMEGVn4kWpi9dz8s7+oXVZURjW2r13h6pq6xQNZDNlXmpR8wHG
+58TSrQC4n1vzdSwMWdptgOA8Sw8adR7ZJI1yNZpmynB2QolKKNESI7FcSKC/+b+H
+LoPkseAwQG9yJo23qEw1GZS67B47iKIqX2wp9VLQobHw7ncrhKXQLSWq973k/Swp
+7lBdfOsTouf72flLiF1HbdOLcFDmWgIbf5scj2HaQe8b/UcCAwEAAaN7MHkwDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHYxBJiJZieW
+e6G1vwn6Q36/crgNMB8GA1UdIwQYMBaAFHYxBJiJZieWe6G1vwn6Q36/crgNMBYG
+A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQCN6WVNYpWJ
+6Z1Ee+otLZYMXhjyR6NUQ5s0aHiug97gB8mTiNlgXiiTgipCbofEmENgh1inYrPC
+WfdXxqOaekSXCQW6nSO1KtBzEYtkN5LrN1cjKqt51P2DbkllinK37wwCS2Kfup1+
+yjhTRxrehSIfsMVK6bTUeSoc8etkgwErZpORhlpqZKWhmOwcMpgsYJJOLhUetqc1
+UNe/254bc0vqHEPT6VI/86c7qAmk1xR0RUfrnKAEqZtUeuoj2fe1L/6yOB16fxt5
+3V3oim7EO6eZCTjDo9fU5DaFiqSMe7WVdr03Na0cWet60XKRH/xaiC6gMWdHWcbh
+vZdXnV1qjlM2
 -----END CERTIFICATE-----

--- a/lib/functions.sh
+++ b/lib/functions.sh
@ -267,7 +267,7 @@ function clone_repo_if_nonexistent() {
 function clone_transfair_if_nonexistent() {
    local base_dir="$1"

-    clone_repo_if_nonexistent https://github.com/samply/transFAIR.git $base_dir/transfair ehds2
+    clone_repo_if_nonexistent https://github.com/samply/transFAIR.git $base_dir/transfair ehds2_develop
 }

 function clone_focus_if_nonexistent() {
Author	SHA1	Message	Date
DavidCroftDKFZ	2c79799815	Pin the landing page to a version known to work	2024-08-29 15:05:39 +02:00
DavidCroftDKFZ	ca93451357	Added ECDC Beam Broker site to list of Firewall exceptions	2024-07-26 09:49:13 +02:00
Gerhard Salvini	892e2c2cf1	Removed misleading text from stop.sh This command no longer disables the Bridgehead in systemctl, it only stops it.	2024-07-18 12:56:42 +02:00
Gerhard Salvini	520c560be0	Got systemctl restart to work locally There were problems on my Ubuntu VM with the target run level that I was using, so I went for the default. Now, if I restart my VM, the Bridgehead is successfully started automatically. Also added some status-generating commands to the run.sh and stop.sh scripts, so that it looks like they are doing something.	2024-07-18 12:31:42 +02:00
Gerhard Salvini	bb81617873	Replaced tabs with spaces	2024-07-17 09:34:46 +02:00
Gerhard Salvini	c27536b566	Cherry picked from ehds2 and updated data upload for new scripts	2024-07-16 16:47:57 +02:00
Gerhard Salvini	f213e6909a	Started adding the new scripts to the README	2024-07-16 16:17:30 +02:00
Gerhard Salvini	6887264a5b	Added infrastructure for running ECDC-Bridgehead under systemctl This comprises of the service file to be copied into the systemctl directory, plus Bridgehead start and stop scripts for both systemctl and for the administrator on the command line.	2024-07-16 16:08:08 +02:00
Gerhard Salvini	5b2c3d7725	Using bridgehead user for performing git pull Otherwise problems can arise with authentication.	2024-07-16 16:06:10 +02:00
DavidCroftDKFZ	a8a15aaad8	Update repos on start When Bridgehead is started, make sure that all repositories are up to date first.	2024-07-12 09:04:08 +02:00
Bridgehead User	2e8b1dc96c	Deal with multiple data files The original TransFAIR logic was only able to handle a single CSV file and broke if there were more. This commit fixes that.	2024-07-12 08:45:17 +02:00
Gerhard Salvini	105495d6cd	Made compatible with ehds2 branch	2024-07-10 14:51:16 +02:00
DavidCroftDKFZ	93e73838c6	Made comments compatible with ehds2 branch	2024-07-10 14:39:46 +02:00
DavidCroftDKFZ	9e72b04824	Added instructions to stop and start Bridgehead	2024-07-10 14:25:21 +02:00
DavidCroftDKFZ	fbe68bc778	Adding more detail to EHDS2-specific installation tasks	2024-07-10 14:18:03 +02:00
Gerhard Salvini	17f372b06c	Implement a gentler way of handling clock skew	2024-07-10 14:02:04 +02:00
Gerhard Salvini	a250d52998	Pinned Blaze version, increased Focus retry count	2024-07-02 14:05:38 +02:00
Gerhard Salvini	e309dc495a	Improved docker-compose for transFAIR In particular, corrected the code for detecting CSV files in the data directory. The old code could not handle more than one CSV file.	2024-06-18 15:28:37 +02:00
Gerhard Salvini	53cdd49fd7	Improved docs, turned off obfuscation ECDC does not want obfuscated results.	2024-03-28 11:04:08 +01:00
Gerhard Salvini	36a97ecc20	Removed ECDC URLs and certificates from dev branch	2024-03-27 16:04:25 +01:00