From 73d969e3743379178dadfe1f399d4da81b676114 Mon Sep 17 00:00:00 2001
From: Martin Lablans <6804500+lablans@users.noreply.github.com>
Date: Fri, 4 Aug 2023 15:29:40 +0200
Subject: [PATCH] Use LDM_PASSWORD for all admin passwords

---
 ccp/modules/datashield-compose.yml | 4 ++--
 ccp/modules/exporter-compose.yml   | 2 +-
 ccp/modules/login-compose.yml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml
index 3fcda9f..6f3a5af 100644
--- a/ccp/modules/datashield-compose.yml
+++ b/ccp/modules/datashield-compose.yml
@@ -4,7 +4,7 @@ services:
     container_name: bridgehead-rstudio
     image: docker.verbis.dkfz.de/ccp/dktk-rstudio:latest
     environment:
-      USER: "ruser"
+      USER: "${PROJECT}"
       PASSWORD: "${RSTUDIO_PASSWORD}"
       HTTP_RELATIVE_PATH: "/rstudio"
     labels:
@@ -33,7 +33,7 @@ services:
     environment:
       JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC"
       # OPAL_ADMINISTRATOR_USER: "administrator" # Please, don't remove this line. It is informative.
-      OPAL_ADMINISTRATOR_PASSWORD: "${OPAL_ADMINISTRATOR_PASSWORD}"
+      OPAL_ADMINISTRATOR_PASSWORD: "${LDM_PASSWORD}"
       POSTGRESDATA_HOST: "opal-db"
       POSTGRESDATA_DATABASE: "opal"
       POSTGRESDATA_USER: "opal"
diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml
index 0673c17..1d96688 100644
--- a/ccp/modules/exporter-compose.yml
+++ b/ccp/modules/exporter-compose.yml
@@ -15,7 +15,7 @@ services:
       WRITE_FILES_LIFETIME_IN_DAYS: "30"
       HTTP_RELATIVE_PATH: "/ccp-exporter"
       HTTP_SERVLET_REQUEST_SCHEME: "https"
-      OPAL_ADMINISTRATOR_PASSWORD: "${OPAL_ADMINISTRATOR_PASSWORD}"
+      OPAL_ADMINISTRATOR_PASSWORD: "${LDM_PASSWORD}"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)"
diff --git a/ccp/modules/login-compose.yml b/ccp/modules/login-compose.yml
index a23584e..1fbe7bb 100644
--- a/ccp/modules/login-compose.yml
+++ b/ccp/modules/login-compose.yml
@@ -15,7 +15,7 @@ services:
     container_name: bridgehead-login
     environment:
       KEYCLOAK_ADMIN: "admin"
-      KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD}"
+      KEYCLOAK_ADMIN_PASSWORD: "${LDM_PASSWORD}"
       KC_DB_PASSWORD: "${KEYCLOAK_DB_PASSWORD}" # Set in teiler-setup.sh
       KC_HOSTNAME_URL: "https://${HOST}/login"
       KC_HOSTNAME_STRICT: "false"