From 01ff53ab235488cb23e8aa335be7bf58c0e7bf53 Mon Sep 17 00:00:00 2001
From: Jakub Lidke <jakub.lidke@uni-marburg.de>
Date: Fri, 25 Aug 2023 13:42:07 +0200
Subject: [PATCH] chore: deployment environment has maria db entries

---
 deploy/docker-compose.yaml | 12 ++++++------
 deploy/env-sample.env      | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index 8dccd4c..a1090ec 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -15,12 +15,12 @@ services:
   db:
     image: mariadb:10
     environment:
-      MARIADB_DATABASE: dev
-      MARIADB_USER: dev
-      MARIADB_PASSWORD: dev
-      MARIADB_ROOT_PASSWORD: dev
-    expose:
-      - "3306"
+      MARIADB_DATABASE: ${MARIADB_DB}
+      MARIADB_USER: ${MARIADB_USER}
+      MARIADB_PASSWORD: ${MARIADB_USER_PW}
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PW}
+    ports:
+      - "3306:3306"
     networks:
       - dnpm_processor
 networks:
diff --git a/deploy/env-sample.env b/deploy/env-sample.env
index 1589096..63fde20 100644
--- a/deploy/env-sample.env
+++ b/deploy/env-sample.env
@@ -12,10 +12,15 @@ APP_PSEUDONYMIZE_GPAS_PASSWORD=
 # path to ca root cert if needed
 APP_PSEUDONYMIZE_GPAS_SSLCALOCATION=
 
+MARIADB_DB=dnpm_monitoring
+MARIADB_USER=$MARIADB_DB
+MARIADB_USER_PW=MySuperSecurePassword111
+MARIADB_ROOT_PW=MySuperDuperSecurePassword111
+
 # monitoring data db
-SPRING_DATASOURCE_URL:jdbc:mariadb://db:3306/dev
-SPRING_DATASOURCE_PASSWORD: dev
-SPRING_DATASOURCE_USERNAME: dev
+SPRING_DATASOURCE_URL:jdbc:mariadb://db:3306/$MARIADB_DB
+SPRING_DATASOURCE_PASSWORD: $MARIADB_USER_PW
+SPRING_DATASOURCE_USERNAME: dnpm_monitoring
 
 ## TARGET SYSTEMS CONFIG
 # DIRECT BWHC
@@ -24,14 +29,14 @@ APP_REST_URI=
 
 ## Apache KAFKA
 # list of broker instances
-APP_KAFKA_SERVERS=
+#APP_KAFKA_SERVERS=
 
 # produce mtb files to this topic
-APP_KAFKA_TOPIC=mtb-file-json
+#APP_KAFKA_TOPIC=mtb-file-json
 
 # here we receive responses from bwhc
-APP_KAFKA_RESPONSE_TOPIC=
-APP_KAFKA_GROUP_ID=dnpm
+#APP_KAFKA_RESPONSE_TOPIC=
+#APP_KAFKA_GROUP_ID=dnpm
 
 # SSL or PLAINTEXT
 SPRING_KAFKA_SECURITY_PROTOCOL=PLAINTEXT