Pin the landing page to a version known to work

Added ECDC Beam Broker site to list of Firewall exceptions
Made scripts executable
2025-06-16 20:40:15 +02:00 · 2024-08-29 15:04:28 +02:00 · 2024-07-26 09:51:46 +02:00 · 2024-07-18 12:52:48 +02:00 · 2024-07-18 12:47:47 +02:00 · 2024-07-17 09:35:50 +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=broker.bbmri.samply.de
+			export EHDS2_BROKER_ID=ecdc-vm-ehds-test1.swedencentral.cloudapp.azure.com
 			export EHDS2_ROOT_CERT=ehds2
 			;;
 		"test")
-			export EHDS2_BROKER_ID=broker.test.bbmri.samply.de
+			export EHDS2_BROKER_ID=ecdc-vm-ehds-test1.swedencentral.cloudapp.azure.com
 			export EHDS2_ROOT_CERT=ehds2.test
 			;;
 		*)
 			report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!"
-			export EHDS2_BROKER_ID=broker.bbmri.samply.de
+			export EHDS2_BROKER_ID=ecdc-vm-ehds-test1.swedencentral.cloudapp.azure.com
 			export EHDS2_ROOT_CERT=ehds2
 			;;
 	esac
--- a/bbmri/modules/ehds2.root.crt.pem
+++ b/bbmri/modules/ehds2.root.crt.pem
@ -1,22 +1,22 @@
-# DKFZ certificate
+# EHDS2/ECDC certificate
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

--- a/bbmri/modules/ehds2.test.root.crt.pem
+++ b/bbmri/modules/ehds2.test.root.crt.pem
@ -1,22 +1,22 @@
-# DKFZ certificate
+# EHDS2/ECDC certificate
 -----BEGIN CERTIFICATE-----
-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
+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
 -----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_develop
+    clone_repo_if_nonexistent https://github.com/samply/transFAIR.git $base_dir/transfair ehds2
 }

 function clone_focus_if_nonexistent() {
Author	SHA1	Message	Date
DavidCroftDKFZ	4f9b662223	Pin the landing page to a version known to work	2024-08-29 15:04:28 +02:00
DavidCroftDKFZ	e323c2765f	Added ECDC Beam Broker site to list of Firewall exceptions	2024-07-26 09:51:46 +02:00
Gerhard Salvini	8c1c0de927	Made scripts executable	2024-07-18 12:52:48 +02:00
DavidCroftDKFZ	56cdd0dcc4	Got automatic Bridgehead restart to work Cherry picked from ehds2_develop branch	2024-07-18 12:47:47 +02:00
Gerhard Salvini	1b9af45991	Replaced tabs with spaces	2024-07-17 09:35:50 +02:00
DavidCroftDKFZ	353fc010cb	Cherry picked the stop/start files from ehds2_develop branch	2024-07-17 09:28:40 +02:00
DavidCroftDKFZ	c15c3962a7	Switched to bridgehead user for git to avoid auth problems	2024-07-17 09:24:37 +02:00
DavidCroftDKFZ	e0fe39ab83	Perform git actions with the bridgehead user, to prevent authentication issues	2024-07-16 16:58:13 +02:00
DavidCroftDKFZ	cce76bab84	Updated README for the new run/stop scripts	2024-07-16 16:55:08 +02:00
DavidCroftDKFZ	013d6d219b	Provided more detailed instructions on uploading data to a Bridgehead	2024-07-15 10:28:21 +02:00
DavidCroftDKFZ	cc228e20d9	Reordered the Bridgehead restart instructions Ordered them so that first a stop is performed, then a start. This reflects what administrators will be doing in real life. Also included a git pull for the Bridgehead, since this will normally also be part of the regular administrative tasks. Also removed a bunch of instructions for the installation, since these steps are now performed automatically by the bridgehead script.	2024-07-15 09:20:18 +02:00
DavidCroftDKFZ	153f654397	Deal with multiple data files, update repos The check for the presence of data in the TransFAIR updating function only worked for single CSV files. Tis commit corrects that. Now also do a git pull on the various repos, to keep things up to date.	2024-07-12 11:07:06 +02:00
DavidCroftDKFZ	70aca8e99c	Wait longer for Blaze to start	2024-07-10 14:34:14 +02:00
DavidCroftDKFZ	f925c27791	Suggested more robust Bridgehead start	2024-07-10 14:26:46 +02:00
DavidCroftDKFZ	350a4c84af	Added extra detail relating to EHDS2	2024-07-10 14:20:40 +02:00
DavidCroftDKFZ	b52931e46c	Pinned Blaze version	2024-07-02 14:11:34 +02:00
DavidCroftDKFZ	eb0f392e3c	Croatia is having problems with a slow starting Blaze, increase Focus retry count	2024-06-13 09:25:57 +02:00
Croft	a738f1468f	Fixed bug in CVS test logic The -f test with a wildcard works OK if there is 0 or 1 CSV files but breaks if there are 2 or more. The replacement uses ls to check if there are any CSV files.	2024-06-07 16:08:16 +02:00
Croft	aa122d0bff	Shortened national node names in config For ECDC, the Beam broker URL is very long, so the resulting Beam ID can be longer than 64 characters, which is too much for the CSR generation algorithm.	2024-05-17 11:44:37 +02:00
Croft	ec4e91fade	Corrected data target directory	2024-05-17 09:59:33 +02:00
Croft	c5f82bf93c	Removed outdated steps relating to transFAIR	2024-05-17 09:57:31 +02:00
Croft	eb563113e0	Merge branch 'ehds2' of https://github.com/samply/bridgehead into ehds2	2024-05-17 09:50:59 +02:00
Croft	a10d0f9605	Added instructions for starting/stopping ECDC Bridgeheads	2024-05-17 09:49:39 +02:00
Patrick Skowronek	994b0a4124	remove time	2024-04-25 14:03:39 +02:00
Gerhard Salvini	593f93fffc	Turned off obfuscation, because ECDC does not want this feature	2024-03-28 11:06:10 +01:00
Gerhard Salvini	b2b9865e8c	Improved documentation for EHDS2/ECDC	2024-03-28 09:22:41 +01:00
Gerhard Salvini	4588960e19	Removed DKFZ URLs and certificates from EHDS2 branch	2024-03-27 16:08:32 +01:00