Remove DNPM-BwHC experiment

ccp/modules/dnpm-compose-bwhc.yml

@@ -1,50 +0,0 @@
-version: "3.7"
-
-services:
-  dnpm-frontend:
-    depends_on: [ dnpm-backend ]
-    build:
-      context: ../../minimal/modules
-      dockerfile: dnpm-frontend.Dockerfile
-      args:
-        NUXT_HOST: 0.0.0.0
-        NUXT_PORT: 3000
-        BACKEND_PROTOCOL: http
-        BACKEND_HOSTNAME: dnpm-backend
-        BACKEND_PORT: 9000
-        DNPM_BWHC_FRONTEND_ZIP: ${DNPM_BWHC_FRONTEND_ZIP}
-        HTTP_PROXY: ${http_proxy}
-        HTTPS_PROXY: ${https_proxy}
-    environment:
-        BACKEND_PROTOCOL: http
-        BACKEND_HOSTNAME: dnpm-backend
-        BACKEND_PORT: 9000
-        no_proxy: dnpm-backend
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.dnpm-frontend.rule=PathPrefix(`/dnpm-frontend`)"
-      - "traefik.http.services.dnpm-frontend.loadbalancer.server.port=3000"
-      - "traefik.http.routers.dnpm-frontend.tls=true"
-
-  dnpm-backend:
-    build:
-      context: ../../minimal/modules
-      dockerfile: dnpm-backend.Dockerfile
-      args:
-        BWHC_BASE_DIR: /bwhc-backend
-        DNPM_BWHC_BACKEND_ZIP: ${DNPM_BWHC_BACKEND_ZIP}
-    environment:
-      APPLICATION_SECRET: ${DNPM_APPLICATION_SECRET}
-      ZPM_SITE: ${ZPM_SITE}
-      noproxy: dnpm-frontend,dnpm-beam-connect
-      # PLAY_HTTP_PORT: 9000
-      # PLAY_HTTP_ADDRESS: 0.0.0.0
-    volumes:
-      - /etc/bridgehead/dnpm/bwhcConnectorConfig.xml:/bwhc-backend/bwhcConnectorConfig.xml:ro
-      - /etc/bridgehead/dnpm/production.conf:/bwhc-backend/production.conf:ro
-      - bwhc_data:/bwhc-backend/data/
-      - bwhc_hgnc_data:/bwhc-backend/hgnc_data/
-
-volumes:
-  bwhc_data:
-  bwhc_hgnc_data:

ccp/modules/dnpm-setup.sh

@@ -2,25 +2,9 @@
 
 if [ -n "${ENABLE_DNPM}" ]; then
 	log INFO "DNPM setup detected (Beam.Connect) -- will start Beam.Connect for DNPM."
-	OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose-beamconnect.yml"
+	OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose.yml"
 
 	# Set variables required for Beam-Connect
 	DNPM_APPLICATION_SECRET="$(echo \"This is a salt string to generate one consistent password. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
 	DNPM_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
-
-	# Optionally, start bwhc as well. This is currently only experimental
-	if [ -n "${ENABLE_DNPM_BWHC}" ]; then
-		log INFO "DNPM setup detected (with Frontend/Backend) -- will start BWHC Frontend/Backend. This is highly experimental!"
-		OVERRIDE+=" -f ./$PROJECT/modules/dnpm-compose-bwhc.yml"
-
-		if [ -z "${DNPM_BWHC_FRONTEND_ZIP}" ]; then
-			fail_and_report 1 "Variable DNPM_BWHC_FRONTEND_ZIP is not set."
-		fi
-		if [ -z "${DNPM_BWHC_BACKEND_ZIP}" ]; then
-			fail_and_report 1 "Variable DNPM_BWHC_BACKEND_ZIP is not set."
-		fi
-		if [ -z "${ZPM_SITE}" ]; then
-			fail_and_report 1 "Variable ZPM_SITE is not set."
-		fi
-	fi
 fi