From e24be0d32592623ae2fc0e3d7f3618437036d72a Mon Sep 17 00:00:00 2001
From: Jakub Lidke
Date: Wed, 30 Aug 2023 11:50:24 +0200
Subject: chore: cleanup deployment docker-compose.yaml and env-sample.env.
 added 'DNPM' prefix for better integration into productive environment.

---
 deploy/env-sample.env | 56 +++++++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

(limited to 'deploy/env-sample.env')

diff --git a/deploy/env-sample.env b/deploy/env-sample.env
index 7399f7b..998400a 100644
--- a/deploy/env-sample.env
+++ b/deploy/env-sample.env
@@ -1,50 +1,40 @@
 # monitoring access port
-MONITORING_HTTP_PORT=8088
+DNPM_MONITORING_HTTP_PORT=8088
+DNPM_LOG_LEVEL=INFO
 
 # GPAS or BUILDIN
-APP_PSEUDONYMIZE_GENERATOR=BUILDIN
-APP_PSEUDONYMIZE_PREFIX=
-APP_PSEUDONYMIZE_GPAS_URI=
-APP_PSEUDONYMIZE_GPAS_TARGET=
-APP_PSEUDONYMIZE_GPAS_USERNAME=
-APP_PSEUDONYMIZE_GPAS_PASSWORD=
+DNPM_PSEUDONYMIZE_GENERATOR=BUILDIN
+DNPM_APP_PSEUDONYMIZE_PREFIX=ANONYM
+DNPM_PSEUDONYMIZE_GPAS_URI=
+DNPM_PSEUDONYMIZE_GPAS_TARGET=
+DNPM_PSEUDONYMIZE_GPAS_USERNAME=
+DNPM_PSEUDONYMIZE_GPAS_PASSWORD=
 
 # path to ca root cert if needed
-APP_PSEUDONYMIZE_GPAS_SSLCALOCATION=
+DNPM_PSEUDONYMIZE_GPAS_SSLCALOCATION=
 
-MARIADB_DB=dnpm_monitoring
-MARIADB_USER=$MARIADB_DB
-MARIADB_USER_PW=MySuperSecurePassword111
-MARIADB_ROOT_PW=MySuperDuperSecurePassword111
+DNPM_MARIADB_DB=dnpm_monitoring
+DNPM_MARIADB_USER=$DNPM_MARIADB_DB
+DNPM_MARIADB_USER_PW=MySuperSecurePassword111
+DNPM_MARIADB_ROOT_PW=MySuperDuperSecurePassword111
 
 # monitoring data db
-SPRING_DATASOURCE_URL=jdbc:mariadb://db:3306/$MARIADB_DB
-SPRING_DATASOURCE_PASSWORD=$MARIADB_USER_PW
-SPRING_DATASOURCE_USERNAME=dnpm_monitoring
+DNPM_DATASOURCE_URL=jdbc:mariadb://dnpm-monitor-db:3306/$DNPM_MARIADB_DB
 
 ## TARGET SYSTEMS CONFIG
-# DIRECT BWHC
 # in case of direct access to bwhc enter endpoint url here
-APP_REST_URI=
+DNPM_BWHC_REST_URI=
 
-## Apache KAFKA if APP_KAFKA_SERVERS and APP_KAFKA_TOPIC have value 'false' kafka support is disabled
-# list of broker instances
-APP_KAFKA_SERVERS=false
-
-# produce mtb files to this topic
-APP_KAFKA_TOPIC=false
+# produce mtb files to this topic - values 'false' disabling kafka processing
+DNPM_KAFKA_TOPIC=false
+KAFKA_BROKERS=false
+DNPM_KAFKA_SECURITY_PROTOCOL=PLAINTEXT
 
 # here we receive responses from bwhc
-APP_KAFKA_RESPONSE_TOPIC=dnpm-response
-APP_KAFKA_GROUP_ID=dnpm
+DNPM_KAFKA_RESPONSE_TOPIC=dnpm-response
+DNPM_KAFKA_GROUP_ID=dnpm
 
 # SSL or PLAINTEXT
-SPRING_KAFKA_SECURITY_PROTOCOL=PLAINTEXT
-SPRING_KAFKA_SSL_TRUST_STORE_TYPE=PKCS12
-SPRING_KAFKA_SSL_TRUST_STORE_LOCATION=file://opt/kafka-certs/ca.p12
-SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD=
-SPRING_KAFKA_SSL_KEY_STORE_TYPE=PKCS12
-SPRING_KAFKA_SSL_KEY_STORE_LOCATION=file://opt/kafka-certs/user.p12
 DNPM_PROCESSOR_KEY_STORE_PASSWORD=
-SPRING_KAFKA_PRODUCER_COMPRESSION_TYPE=gzip
-KAFKA_KEY_STORE_LOCATION=file://opt/kafka-certs/user.p12
+DNPM_TO_SSL_KEYSTORE_LOCATION=
+
-- 
cgit v1.2.3