diff --git a/dhki/dhki.dev.root.crt.pem b/dhki/dhki.dev.root.crt.pem new file mode 100644 index 0000000..720932c --- /dev/null +++ b/dhki/dhki.dev.root.crt.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUOnK0MXiKRGGyapGkiqzqR7k9QXwwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjYwNjExMTIzMzA3WhcNMzYw +NjA4MTIzMzM2WjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAMOoTwNkkY0Bw7J18iDQw80TQfQ2XpryrGujJXw+ +6KwbS3SGtI6pHVkxIKpUdnwGsVcK3HxQRjhPLRs19uQUf+MxcQ5F8HAZf0Lw+mcK +WKdQtLqcBqfcHncpy1+Y91eS0+DUjwXYTQ0YZFqHEVu7xD//mQWLLCnSGMwpn0ul +CsnahYhSU9EXXlxkJwiasoGCDXP4f3swzjBdKJQUboWpROOOvitOYISzQtajJ+sj +H4NkMW6b9PN+bd4kHCJhfEwgTIYqSMIsot8TY9rB2qEiOQmpUtB4YhyK8U6m+hqT +MgJIjyT2+Jk0fR0X5RlK/B3CFUmh++bSpxcMEdBFZ7ckVGsCAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFmD49Cr8Tlb +zSr4kwff+8/k2wo0MB8GA1UdIwQYMBaAFFmD49Cr8TlbzSr4kwff+8/k2wo0MBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQAlA8KWIV4S +g9k6VufdTZ11NoaNphwwf2FMv4th2Ryo9mlF98Y0jK9Eq42fJi3wWU8BTF+o7spG +wjtd3v0CdmgcQBv1ybd7XJvxpIqu+fLbhivJqsy+PhmK/pFnIcz7O9oe9GBcE3AE +e2x+v9Qe+SCw8DGYA4JWm34UX6eb9K32DunvEvfh6QSM+jzkZl7k1UCnkvbIxQo/ +zSYXP2fBg7Ia3dYsaMG7hBUSoqSDxLu/2hco0FGMr9K1wroSk/MCjUt2y9z6VSKs +etAS517I03gIBWELbkp2j5qUhiRSpboq8M0fdv8wECHAMibfsX7LeGF56TMjZ5Ct +YH/UxAheEW5I +-----END CERTIFICATE----- diff --git a/dhki/root.crt.pem b/dhki/dhki.root.crt.pem similarity index 100% rename from dhki/root.crt.pem rename to dhki/dhki.root.crt.pem diff --git a/dhki/docker-compose.yml b/dhki/docker-compose.yml index 49737f5..d53c9fe 100644 --- a/dhki/docker-compose.yml +++ b/dhki/docker-compose.yml @@ -56,7 +56,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/dhki/root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/dhki/modules/${DHKI_ROOT_CERT}.crt.pem:/conf/root.crt.pem:ro volumes: diff --git a/dhki/modules/dhki-setup.sh b/dhki/modules/dhki-setup.sh new file mode 100644 index 0000000..4dca321 --- /dev/null +++ b/dhki/modules/dhki-setup.sh @@ -0,0 +1,19 @@ +#!/bin/bash +log INFO "DKFZ-Hector setup detected -- will start services for DKFZ-Hector." + +# The environment needs to be defined in /etc/bridgehead +case "$ENVIRONMENT" in + "production") + export BROKER_ID=broker.hector.dkfz.de + export DHKI_ROOT_CERT=dhki + ;; + "development") + export BROKER_ID=dev-dhki-broker.vms.verbis.dkfz.de + export DHKI_ROOT_CERT=dhki.dev + ;; + *) + report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!" + export BROKER_ID=broker.hector.dkfz.de + export DHKI_ROOT_CERT=dhki + ;; +esac diff --git a/dhki/vars b/dhki/vars index 1a2ad7c..8801716 100644 --- a/dhki/vars +++ b/dhki/vars @@ -1,4 +1,7 @@ -BROKER_ID=broker.hector.dkfz.de +# This sets beam broker config depending on ENVIRONMENT +source dhki/modules/dhki-setup.sh + +# BROKER_ID is exported by previous script 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)"