mirror of
				https://github.com/samply/bridgehead.git
				synced 2025-11-04 15:20:17 +01:00 
			
		
		
		
	Revert "Added DHKI project"
This commit is contained in:
		@@ -38,9 +38,6 @@ case "$PROJECT" in
 | 
			
		||||
	itcc)
 | 
			
		||||
		#nothing extra to do
 | 
			
		||||
		;;
 | 
			
		||||
	dhki)
 | 
			
		||||
		#nothing extra to do
 | 
			
		||||
		;;
 | 
			
		||||
	minimal)
 | 
			
		||||
		#nothing extra to do
 | 
			
		||||
		;;
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
function idManagementSetup() {
 | 
			
		||||
	if [ -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
 | 
			
		||||
		log INFO "id-management setup detected -- will start id-management (mainzelliste & magicpl)."
 | 
			
		||||
		OVERRIDE+=" -f ./ccp/modules/id-management-compose.yml"
 | 
			
		||||
		OVERRIDE+=" -f ./$PROJECT/modules/id-management-compose.yml"
 | 
			
		||||
 | 
			
		||||
		# Auto Generate local Passwords
 | 
			
		||||
		PATIENTLIST_POSTGRES_PASSWORD="$(echo \"id-management-module-db-password-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@ function obds2fhirRestSetup() {
 | 
			
		||||
      log ERROR "Missing ID-Management Module! Fix this by setting up ID Management:"
 | 
			
		||||
      PATIENTLIST_URL=" "
 | 
			
		||||
    fi
 | 
			
		||||
    OVERRIDE+=" -f ./ccp/modules/obds2fhir-rest-compose.yml"
 | 
			
		||||
    OVERRIDE+=" -f ./$PROJECT/modules/obds2fhir-rest-compose.yml"
 | 
			
		||||
    LOCAL_SALT="$(echo \"local-random-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
 | 
			
		||||
  fi
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,66 +0,0 @@
 | 
			
		||||
version: "3.7"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  blaze:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/blaze:0.28
 | 
			
		||||
    container_name: bridgehead-dhki-blaze
 | 
			
		||||
    environment:
 | 
			
		||||
      BASE_URL: "http://bridgehead-dhki-blaze:8080"
 | 
			
		||||
      JAVA_TOOL_OPTIONS: "-Xmx${BLAZE_MEMORY_CAP:-4096}m"
 | 
			
		||||
      DB_RESOURCE_CACHE_SIZE: ${BLAZE_RESOURCE_CACHE_CAP:-2500000}
 | 
			
		||||
      DB_BLOCK_CACHE_SIZE: $BLAZE_MEMORY_CAP
 | 
			
		||||
      ENFORCE_REFERENTIAL_INTEGRITY: "false"
 | 
			
		||||
    volumes:
 | 
			
		||||
      - "blaze-data:/app/data"
 | 
			
		||||
    labels:
 | 
			
		||||
      - "traefik.enable=true"
 | 
			
		||||
      - "traefik.http.routers.blaze_dhki.rule=PathPrefix(`/dhki-localdatamanagement`)"
 | 
			
		||||
      - "traefik.http.middlewares.dhki_b_strip.stripprefix.prefixes=/dhki-localdatamanagement"
 | 
			
		||||
      - "traefik.http.services.blaze_dhki.loadbalancer.server.port=8080"
 | 
			
		||||
      - "traefik.http.routers.blaze_dhki.middlewares=dhki_b_strip,auth"
 | 
			
		||||
      - "traefik.http.routers.blaze_dhki.tls=true"
 | 
			
		||||
 | 
			
		||||
  focus:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG}
 | 
			
		||||
    container_name: bridgehead-focus
 | 
			
		||||
    environment:
 | 
			
		||||
      API_KEY: ${FOCUS_BEAM_SECRET_SHORT}
 | 
			
		||||
      BEAM_APP_ID_LONG: focus.${PROXY_ID}
 | 
			
		||||
      PROXY_ID: ${PROXY_ID}
 | 
			
		||||
      BLAZE_URL: "http://bridgehead-dhki-blaze:8080/fhir/"
 | 
			
		||||
      BEAM_PROXY_URL: http://beam-proxy:8081
 | 
			
		||||
      RETRY_COUNT: ${FOCUS_RETRY_COUNT}
 | 
			
		||||
      EPSILON: 0.28
 | 
			
		||||
      QUERIES_TO_CACHE: '/queries_to_cache.conf'
 | 
			
		||||
    volumes:
 | 
			
		||||
      - /srv/docker/bridgehead/dhki/queries_to_cache.conf:/queries_to_cache.conf
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - "beam-proxy"
 | 
			
		||||
      - "blaze"
 | 
			
		||||
 | 
			
		||||
  beam-proxy:
 | 
			
		||||
    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
 | 
			
		||||
    container_name: bridgehead-beam-proxy
 | 
			
		||||
    environment:
 | 
			
		||||
      BROKER_URL: ${BROKER_URL}
 | 
			
		||||
      PROXY_ID: ${PROXY_ID}
 | 
			
		||||
      APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
 | 
			
		||||
      PRIVKEY_FILE: /run/secrets/proxy.pem
 | 
			
		||||
      ALL_PROXY: http://forward_proxy:3128
 | 
			
		||||
      TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
 | 
			
		||||
      ROOTCERT_FILE: /conf/root.crt.pem
 | 
			
		||||
    secrets:
 | 
			
		||||
      - proxy.pem
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - "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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
volumes:
 | 
			
		||||
  blaze-data:
 | 
			
		||||
 | 
			
		||||
secrets:
 | 
			
		||||
  proxy.pem:
 | 
			
		||||
    file: /etc/bridgehead/pki/${SITE_ID}.priv.pem
 | 
			
		||||
@@ -1,2 +0,0 @@
 | 
			
		||||
bGlicmFyeSBSZXRyaWV2ZQp1c2luZyBGSElSIHZlcnNpb24gJzQuMC4wJwppbmNsdWRlIEZISVJIZWxwZXJzIHZlcnNpb24gJzQuMC4wJwpjb2Rlc3lzdGVtIFNhbXBsZU1hdGVyaWFsVHlwZTogJ2h0dHBzOi8vZmhpci5iYm1yaS5kZS9Db2RlU3lzdGVtL1NhbXBsZU1hdGVyaWFsVHlwZScKCmNvZGVzeXN0ZW0gbG9pbmM6ICdodHRwOi8vbG9pbmMub3JnJwoKY29udGV4dCBQYXRpZW50CgpES1RLX1NUUkFUX0dFTkRFUl9TVFJBVElGSUVSCgpES1RLX1NUUkFUX0FHRV9TVFJBVElGSUVSCgpES1RLX1NUUkFUX0RFQ0VBU0VEX1NUUkFUSUZJRVIKCkRLVEtfU1RSQVRfRElBR05PU0lTX1NUUkFUSUZJRVIKCkRIS0lfU1RSQVRfU1BFQ0lNRU5fU1RSQVRJRklFUgoKREtUS19TVFJBVF9QUk9DRURVUkVfU1RSQVRJRklFUgoKREhLSV9TVFJBVF9NRURJQ0FUSU9OX1NUUkFUSUZJRVIKCkRIS0lfU1RSQVRfRU5DT1VOVEVSX1NUUkFUSUZJRVIKREtUS19TVFJBVF9ERUZfSU5fSU5JVElBTF9QT1BVTEFUSU9OCnRydWU=
 | 
			
		||||
bGlicmFyeSBSZXRyaWV2ZQp1c2luZyBGSElSIHZlcnNpb24gJzQuMC4wJwppbmNsdWRlIEZISVJIZWxwZXJzIHZlcnNpb24gJzQuMC4wJwpjb2Rlc3lzdGVtIFNhbXBsZU1hdGVyaWFsVHlwZTogJ2h0dHBzOi8vZmhpci5iYm1yaS5kZS9Db2RlU3lzdGVtL1NhbXBsZU1hdGVyaWFsVHlwZScKCmNvZGVzeXN0ZW0gbG9pbmM6ICdodHRwOi8vbG9pbmMub3JnJwpjb2Rlc3lzdGVtIGljZDEwOiAnaHR0cDovL2ZoaXIuZGUvQ29kZVN5c3RlbS9iZmFybS9pY2QtMTAtZ20nCmNvZGVzeXN0ZW0gbW9ycGg6ICd1cm46b2lkOjIuMTYuODQwLjEuMTEzODgzLjYuNDMuMScKCmNvbnRleHQgUGF0aWVudAoKREtUS19TVFJBVF9HRU5ERVJfU1RSQVRJRklFUgoKREtUS19TVFJBVF9BR0VfU1RSQVRJRklFUgoKREtUS19TVFJBVF9ERUNFQVNFRF9TVFJBVElGSUVSCgpES1RLX1NUUkFUX0RJQUdOT1NJU19TVFJBVElGSUVSCgpESEtJX1NUUkFUX1NQRUNJTUVOX1NUUkFUSUZJRVIKCkRLVEtfU1RSQVRfUFJPQ0VEVVJFX1NUUkFUSUZJRVIKCkRIS0lfU1RSQVRfTUVESUNBVElPTl9TVFJBVElGSUVSCgpESEtJX1NUUkFUX0VOQ09VTlRFUl9TVFJBVElGSUVSCkRLVEtfU1RSQVRfREVGX0lOX0lOSVRJQUxfUE9QVUxBVElPTgooKChleGlzdHMgW0NvbmRpdGlvbjogQ29kZSAnQzM0LjknIGZyb20gaWNkMTBdKSBvcgooZXhpc3RzIFtDb25kaXRpb246IENvZGUgJ0MzNC44JyBmcm9tIGljZDEwXSkgb3IKKGV4aXN0cyBbQ29uZGl0aW9uOiBDb2RlICdDMzQuMCcgZnJvbSBpY2QxMF0pIG9yCihleGlzdHMgW0NvbmRpdGlvbjogQ29kZSAnQzM0LjInIGZyb20gaWNkMTBdKSBvcgooZXhpc3RzIFtDb25kaXRpb246IENvZGUgJ0MzNC4xJyBmcm9tIGljZDEwXSkgb3IKKGV4aXN0cyBbQ29uZGl0aW9uOiBDb2RlICdDMzQuMycgZnJvbSBpY2QxMF0pKSBhbmQKKChleGlzdHMgZnJvbSBbT2JzZXJ2YXRpb246IENvZGUgJzU5ODQ3LTQnIGZyb20gbG9pbmNdIE8Kd2hlcmUgTy52YWx1ZS5jb2RpbmcuY29kZSBjb250YWlucyAnODE0MC8zJykgb3IKKGV4aXN0cyBmcm9tIFtPYnNlcnZhdGlvbjogQ29kZSAnNTk4NDctNCcgZnJvbSBsb2luY10gTwp3aGVyZSBPLnZhbHVlLmNvZGluZy5jb2RlIGNvbnRhaW5zICc4MTQxLzMnKSBvcgooZXhpc3RzIGZyb20gW09ic2VydmF0aW9uOiBDb2RlICc1OTg0Ny00JyBmcm9tIGxvaW5jXSBPCndoZXJlIE8udmFsdWUuY29kaW5nLmNvZGUgY29udGFpbnMgJzgxNDMvMycpIG9yCihleGlzdHMgZnJvbSBbT2JzZXJ2YXRpb246IENvZGUgJzU5ODQ3LTQnIGZyb20gbG9pbmNdIE8Kd2hlcmUgTy52YWx1ZS5jb2RpbmcuY29kZSBjb250YWlucyAnODE0Ny8zJykgb3IKKGV4aXN0cyBmcm9tIFtPYnNlcnZhdGlvbjogQ29kZSAnNTk4NDctNCcgZnJvbSBsb2luY10gTwp3aGVyZSBPLnZhbHVlLmNvZGluZy5jb2RlIGNvbnRhaW5zICc4MjUwLzMnKSBvcgooZXhpc3RzIGZyb20gW09ic2VydmF0aW9uOiBDb2RlICc1OTg0Ny00JyBmcm9tIGxvaW5jXSBPCndoZXJlIE8udmFsdWUuY29kaW5nLmNvZGUgY29udGFpbnMgJzgyNTEvMycpIG9yCihleGlzdHMgZnJvbSBbT2JzZXJ2YXRpb246IENvZGUgJzU5ODQ3LTQnIGZyb20gbG9pbmNdIE8Kd2hlcmUgTy52YWx1ZS5jb2RpbmcuY29kZSBjb250YWlucyAnODI1Mi8zJykgb3IKKGV4aXN0cyBmcm9tIFtPYnNlcnZhdGlvbjogQ29kZSAnNTk4NDctNCcgZnJvbSBsb2luY10gTwp3aGVyZSBPLnZhbHVlLmNvZGluZy5jb2RlIGNvbnRhaW5zICc4MjUzLzMnKSBvcgooZXhpc3RzIGZyb20gW09ic2VydmF0aW9uOiBDb2RlICc1OTg0Ny00JyBmcm9tIGxvaW5jXSBPCndoZXJlIE8udmFsdWUuY29kaW5nLmNvZGUgY29udGFpbnMgJzgyNTUvMycpIG9yCihleGlzdHMgZnJvbSBbT2JzZXJ2YXRpb246IENvZGUgJzU5ODQ3LTQnIGZyb20gbG9pbmNdIE8Kd2hlcmUgTy52YWx1ZS5jb2RpbmcuY29kZSBjb250YWlucyAnODI2MC8zJykgb3IKKGV4aXN0cyBmcm9tIFtPYnNlcnZhdGlvbjogQ29kZSAnNTk4NDctNCcgZnJvbSBsb2luY10gTwp3aGVyZSBPLnZhbHVlLmNvZGluZy5jb2RlIGNvbnRhaW5zICc4MzEwLzMnKSBvcgooZXhpc3RzIGZyb20gW09ic2VydmF0aW9uOiBDb2RlICc1OTg0Ny00JyBmcm9tIGxvaW5jXSBPCndoZXJlIE8udmFsdWUuY29kaW5nLmNvZGUgY29udGFpbnMgJzgzMzMvMycpIG9yCihleGlzdHMgZnJvbSBbT2JzZXJ2YXRpb246IENvZGUgJzU5ODQ3LTQnIGZyb20gbG9pbmNdIE8Kd2hlcmUgTy52YWx1ZS5jb2RpbmcuY29kZSBjb250YWlucyAnODQ3MC8zJykgb3IKKGV4aXN0cyBmcm9tIFtPYnNlcnZhdGlvbjogQ29kZSAnNTk4NDctNCcgZnJvbSBsb2luY10gTwp3aGVyZSBPLnZhbHVlLmNvZGluZy5jb2RlIGNvbnRhaW5zICc4NDgwLzMnKSBvcgooZXhpc3RzIGZyb20gW09ic2VydmF0aW9uOiBDb2RlICc1OTg0Ny00JyBmcm9tIGxvaW5jXSBPCndoZXJlIE8udmFsdWUuY29kaW5nLmNvZGUgY29udGFpbnMgJzg0OTAvMycpIG9yCihleGlzdHMgZnJvbSBbT2JzZXJ2YXRpb246IENvZGUgJzU5ODQ3LTQnIGZyb20gbG9pbmNdIE8Kd2hlcmUgTy52YWx1ZS5jb2RpbmcuY29kZSBjb250YWlucyAnODU1MC8zJykgb3IKKGV4aXN0cyBmcm9tIFtPYnNlcnZhdGlvbjogQ29kZSAnNTk4NDctNCcgZnJvbSBsb2luY10gTwp3aGVyZSBPLnZhbHVlLmNvZGluZy5jb2RlIGNvbnRhaW5zICc4MDUyLzMnKSkp
 | 
			
		||||
@@ -1,20 +0,0 @@
 | 
			
		||||
-----BEGIN CERTIFICATE-----
 | 
			
		||||
MIIDNTCCAh2gAwIBAgIUSWUPebUMNfJvPKMjdgX+WiH+OXgwDQYJKoZIhvcNAQEL
 | 
			
		||||
BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjQwMTA1MDg1NTM4WhcNMzQw
 | 
			
		||||
MTAyMDg1NjA4WjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN
 | 
			
		||||
AQEBBQADggEPADCCAQoCggEBAL/nvo9Bn1/6Z/K4BKoLM6/mVziM4cmXTVx4npVz
 | 
			
		||||
pnptwPPFU4rz47akRZ6ZMD5MO0bsyvaxG1nwVrW3aAGC42JIGTdZHKwMKrd35sxw
 | 
			
		||||
k3YlGJagGUs+bKHUCL55OcSmyDWlh/UhA8+eeJWjOt9u0nYXv+vi+N4JSHA0oC9D
 | 
			
		||||
bTF1v+7blrTQagf7PTPSF3pe22iXOjJYdOkZMWoMoNAjn6F958fkLNLY3csOZwvP
 | 
			
		||||
/3eyNNawyAEPWeIm33Zk630NS8YHggz6WCqwXvuaKb6910mRP8jgauaYsqgsOyDt
 | 
			
		||||
pbWuvk//aZWdGeN9RNsAA8eGppygiwm/m9eRC6I0shDwv6ECAwEAAaN7MHkwDgYD
 | 
			
		||||
VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFn/dbW1J3ry
 | 
			
		||||
7TBzbKo3H4vJr2MiMB8GA1UdIwQYMBaAFFn/dbW1J3ry7TBzbKo3H4vJr2MiMBYG
 | 
			
		||||
A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQCa2V8B8aad
 | 
			
		||||
XNDS1EUIi9oMdvGvkolcdFwx9fI++qu9xSIaZs5GETHck3oYKZF0CFP5ESnKDn5w
 | 
			
		||||
enWgm5M0y+hVZppzB163WmET1efBXwrdyn8j4336NjX352h63JGWCaI2CfZ1qG1p
 | 
			
		||||
kf5W9CVXllSFaJe5r994ovgyHvK2ucWwe8l8iMJbQhH79oKi/9uJMCD6aUXnpg1K
 | 
			
		||||
nPHW1lsVx6foqYWijdBdtFU2i7LSH2OYo0nb1PgRnY/SABV63JHfJnqW9dZy4f7G
 | 
			
		||||
rpsvvrmFrKmEnCZH0n6qveY3Z5bMD94Yx0ebkCTYEqAw3pV65gwxrzBTpEg6dgF0
 | 
			
		||||
eG0eKFUS0REJ
 | 
			
		||||
-----END CERTIFICATE-----
 | 
			
		||||
							
								
								
									
										20
									
								
								dhki/vars
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								dhki/vars
									
									
									
									
									
								
							@@ -1,20 +0,0 @@
 | 
			
		||||
BROKER_ID=broker.hector.dkfz.de
 | 
			
		||||
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)"
 | 
			
		||||
FOCUS_RETRY_COUNT=${FOCUS_RETRY_COUNT:-64}
 | 
			
		||||
SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de
 | 
			
		||||
PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
 | 
			
		||||
 | 
			
		||||
BROKER_URL_FOR_PREREQ=$BROKER_URL
 | 
			
		||||
 | 
			
		||||
POSTGRES_TAG=15.6-alpine
 | 
			
		||||
 | 
			
		||||
for module in ccp/modules/*.sh
 | 
			
		||||
do
 | 
			
		||||
    log DEBUG "sourcing $module"
 | 
			
		||||
    source $module
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
idManagementSetup
 | 
			
		||||
obds2fhirRestSetup
 | 
			
		||||
@@ -57,9 +57,6 @@ case "$PROJECT" in
 | 
			
		||||
		;;
 | 
			
		||||
	itcc)
 | 
			
		||||
		site_configuration_repository_middle="git.verbis.dkfz.de/itcc-sites/"
 | 
			
		||||
        ;;
 | 
			
		||||
    dhki)
 | 
			
		||||
        site_configuration_repository_middle="git.verbis.dkfz.de/dhki/"
 | 
			
		||||
		;;
 | 
			
		||||
	minimal)
 | 
			
		||||
		site_configuration_repository_middle="git.verbis.dkfz.de/minimal-bridgehead-configs/"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user