From 4754eb282b68d0d60442eec03ab2cb6206251339 Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Tue, 15 Aug 2023 13:55:07 +0200 Subject: [PATCH] add migration for old credentials --- lib/install-bridgehead.sh | 2 +- lib/update-bridgehead.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/install-bridgehead.sh b/lib/install-bridgehead.sh index d0e9964..784020e 100755 --- a/lib/install-bridgehead.sh +++ b/lib/install-bridgehead.sh @@ -35,7 +35,7 @@ if [ -z "$LDM_AUTH" ]; then add_basic_auth_user $PROJECT $generated_passwd "LDM_AUTH" $PROJECT fi -if [ -z "$NNGM_CTS_APIKEY" ] && [ -z "$NNGM_AUTH" ]; then +if [ ! -z "$NNGM_CTS_APIKEY" ] && [ -z "$NNGM_AUTH" ]; then log "INFO" "Now generating basic auth for nNGM upload API (see addUser in bridgehead for more information). " generated_passwd="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 32)" add_basic_auth_user "nngm" $generated_passwd "NNGM_AUTH" $PROJECT diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index 89db369..0d985f7 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -139,6 +139,13 @@ else log WARN "Automated backups are disabled (variable AUTO_BACKUPS != \"true\")" fi +if [ ! -z "$LDM_PASSWORD" ]; then + FILE="/etc/bridgehead/$PROJECT.local.conf" + log "INFO" "Migrating LDM_PASSWORD to encrypted credentials in $FILE" + add_basic_auth_user $PROJECT $LDM_PASSWORD "LDM_AUTH" $PROJECT + sed -i "/LDM_PASSWORD/{d;}" $FILE +fi + exit 0 # TODO: Print last commit explicit