samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from samply/feature/nngm-rest 

nngm migration from connector to nngm-rest
This commit is contained in:
Pierre Delpy 2023-05-10 10:36:01 +02:00 committed by GitHub
parent 9260d0132a dd0d2c64fd
commit 465ba95e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ccp/nngm-compose.yml
View File

@ -1,32 +1,24 @@
version: "3.7" version: "3.7"
volumes:
nngm-rest:
services: services:
connector: connector:
container_name: bridgehead-connector container_name: bridgehead-connector
image: docker.verbis.dkfz.de/ccp/connector:bk2 image: docker.verbis.dkfz.de/ccp/nngm-rest:main
environment: environment:
POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASSWORD} CTS_MAGICPL_API_KEY: ${NNGM_MAGICPL_APIKEY}
NNGM_MAGICPL_APIKEY: ${NNGM_MAGICPL_APIKEY} CTS_API_KEY: ${NNGM_CTS_APIKEY}
NNGM_MAINZELLISTE_APIKEY: ${NNGM_MAINZELLISTE_APIKEY} CRYPT_KEY: ${NNGM_CRYPTKEY}
NNGM_CTS_APIKEY: ${NNGM_CTS_APIKEY} #CTS_MAGICPL_SITE: ${SITE_ID}TODO
NNGM_CRYPTKEY: ${NNGM_CRYPTKEY}
restart: always restart: always
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.connector.rule=PathPrefix(`/ccp-connector`)" - "traefik.http.routers.connector.rule=PathPrefix(`/nngm-connector`)"
- "traefik.http.middlewares.connector_strip.stripprefix.prefixes=/nngm-connector"
- "traefik.http.services.connector.loadbalancer.server.port=8080" - "traefik.http.services.connector.loadbalancer.server.port=8080"
- "traefik.http.routers.connector.tls=true" - "traefik.http.routers.connector.tls=true"
- "traefik.http.routers.connector.middlewares=connector_strip,auth"
connector_db:
image: docker.verbis.dkfz.de/cache/postgres:9.5-alpine
container_name: bridgehead-ccp-connector-db
volumes: volumes:
- "connector_db_data:/var/lib/postgresql/data" - nngm-rest:/var/log
environment:
POSTGRES_DB: "samplyconnector"
POSTGRES_USER: "samplyconnector"
POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASSWORD}
restart: always
volumes:
connector_db_data:

7
ccp/nngm-setup.sh
View File

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
##nNGM vars:
#NNGM_MAGICPL_APIKEY
#NNGM_CTS_APIKEY
#NNGM_CRYPTKEY
function nngmSetup() { function nngmSetup() {
if [ -n "$NNGM_CTS_APIKEY" ]; then if [ -n "$NNGM_CTS_APIKEY" ]; then
log INFO "nNGM setup detected -- will start nNGM Connector." log INFO "nNGM setup detected -- will start nNGM Connector."
OVERRIDE+=" -f ./$PROJECT/nngm-compose.yml" OVERRIDE+=" -f ./$PROJECT/nngm-compose.yml"
fi fi
CONNECTOR_POSTGRES_PASSWORD="$(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)" }
}
function mtbaSetup() { function mtbaSetup() {
# TODO: Check if ID-Management Module is activated! # TODO: Check if ID-Management Module is activated!