From 5ea782c90cdb6d19b85dde7f7210fe940e6987b6 Mon Sep 17 00:00:00 2001 From: Torben Brenner Date: Thu, 17 Oct 2024 15:23:04 +0200 Subject: [PATCH] breakmorestuff: hardcoded ccp in modules --- ccp/modules/exporter-setup.sh | 2 +- ccp/modules/teiler-setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccp/modules/exporter-setup.sh b/ccp/modules/exporter-setup.sh index 9b947a6..93c55ad 100644 --- a/ccp/modules/exporter-setup.sh +++ b/ccp/modules/exporter-setup.sh @@ -2,7 +2,7 @@ if [ "$ENABLE_EXPORTER" == true ]; then log INFO "Exporter setup detected -- will start Exporter service." - OVERRIDE+=" -f ./$PROJECT/modules/exporter-compose.yml" + OVERRIDE+=" -f ./ccp/modules/exporter-compose.yml" EXPORTER_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the exporter. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)" EXPORTER_API_KEY="$(echo \"This is a salt string to generate one consistent API KEY for the exporter. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 64)" fi diff --git a/ccp/modules/teiler-setup.sh b/ccp/modules/teiler-setup.sh index eed3f81..dbf4efe 100644 --- a/ccp/modules/teiler-setup.sh +++ b/ccp/modules/teiler-setup.sh @@ -2,7 +2,7 @@ if [ "$ENABLE_TEILER" == true ];then log INFO "Teiler setup detected -- will start Teiler services." - OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml" + OVERRIDE+=" -f ./ccp/modules/teiler-compose.yml" TEILER_DEFAULT_LANGUAGE=DE TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,} add_public_oidc_redirect_url "/ccp-teiler/*"