From b7d110b2d86e2638934fade3ec045ae293e41d0a Mon Sep 17 00:00:00 2001 From: Pierre Delpy Date: Tue, 13 Oct 2026 15:36:41 +0200 Subject: [PATCH] cce: select broker and root CA by ENVIRONMENT ENVIRONMENT=test keeps CCE sites on test-no-real-data.broker.samply.de with its root CA in cce/test.root.crt.pem; every other environment uses broker.cce.dkfz.de and cce/root.crt.pem. --- cce/docker-compose.yml | 2 +- cce/test.root.crt.pem | 20 ++++++++++++++++++++ cce/vars | 5 +++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 cce/test.root.crt.pem diff --git a/cce/docker-compose.yml b/cce/docker-compose.yml index 99039e7..b996738 100644 --- a/cce/docker-compose.yml +++ b/cce/docker-compose.yml @@ -57,7 +57,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/cce/root.crt.pem:/conf/root.crt.pem:ro + - ${ROOT_CRT_FILE}:/conf/root.crt.pem:ro volumes: diff --git a/cce/test.root.crt.pem b/cce/test.root.crt.pem new file mode 100644 index 0000000..1f1265a --- /dev/null +++ b/cce/test.root.crt.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUW34NEb7bl0+Ywx+I1VKtY5vpAOowDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjQwMTIyMTMzNzEzWhcNMzQw +MTE5MTMzNzQzWjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAL5UegLXTlq3XRRj8LyFs3aF0tpRPVoW9RXp5kFI +TnBvyO6qjNbMDT/xK+4iDtEX4QQUvsxAKxfXbe9i1jpdwjgH7JHaSGm2IjAiKLqO +OXQQtguWwfNmmp96Ql13ArLj458YH08xMO/w2NFWGwB/hfARa4z/T0afFuc/tKJf +XbGCG9xzJ9tmcG45QN8NChGhVvaTweNdVxGWlpHxmi0Mn8OM9CEuB7nPtTTiBuiu +pRC2zVVmNjVp4ktkAqL7IHOz+/F5nhiz6tOika9oD3376Xj055lPznLcTQn2+4d7 +K7ZrBopCFxIQPjkgmYRLfPejbpdUjK1UVJw7hbWkqWqH7JMCAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFGjvRcaIP4HM +poIguUAK9YL2n7fbMB8GA1UdIwQYMBaAFGjvRcaIP4HMpoIguUAK9YL2n7fbMBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQCbzycJSaDm +AXXNJqQ88djrKs5MDXS8RIjS/cu2ayuLaYDe+BzVmUXNA0Vt9nZGdaz63SLLcjpU +fNSxBfKbwmf7s30AK8Cnfj9q4W/BlBeVizUHQsg1+RQpDIdMrRQrwkXv8mfLw+w5 +3oaXNW6W/8KpBp/H8TBZ6myl6jCbeR3T8EMXBwipMGop/1zkbF01i98Xpqmhx2+l +n+80ofPsSspOo5XmgCZym8CD/m/oFHmjcvOfpOCvDh4PZ+i37pmbSlCYoMpla3u/ +7MJMP5lugfLBYNDN2p+V4KbHP/cApCDT5UWLOeAWjgiZQtHH5ilDeYqEc1oPjyJt +Rtup0MTxSJtN +-----END CERTIFICATE----- \ No newline at end of file diff --git a/cce/vars b/cce/vars index 971fe99..97b5607 100644 --- a/cce/vars +++ b/cce/vars @@ -1,4 +1,9 @@ BROKER_ID=broker.cce.dkfz.de +ROOT_CRT_FILE=/srv/docker/bridgehead/cce/root.crt.pem +if [ "$ENVIRONMENT" == "test" ]; then + BROKER_ID=test-no-real-data.broker.samply.de + ROOT_CRT_FILE=/srv/docker/bridgehead/cce/test.root.crt.pem +fi BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"