From af25df79e3f97cf6c181e28aea550ebf221934c8 Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Tue, 15 Aug 2023 15:42:42 +0200 Subject: [PATCH] refactor addUser to adduser - lowercase --- bridgehead | 2 +- lib/functions.sh | 2 +- lib/install-bridgehead.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridgehead b/bridgehead index 192cc0e..4665f5a 100755 --- a/bridgehead +++ b/bridgehead @@ -102,7 +102,7 @@ case "$ACTION" in uninstall) exec ./lib/uninstall-bridgehead.sh $PROJECT ;; - addUser) + adduser) loadVars log "INFO" "Adding encrypted credentials in /etc/bridgehead/$PROJECT.local.conf" read -p "Please choose the component (LDM_AUTH|NNGM_AUTH) you want to add a user to : " COMPONENT diff --git a/lib/functions.sh b/lib/functions.sh index 9173e86..ed0478e 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -26,7 +26,7 @@ checkOwner(){ } printUsage() { - echo "Usage: bridgehead start|stop|is-running|update|install|uninstall|addUser|enroll PROJECTNAME" + echo "Usage: bridgehead start|stop|is-running|update|install|uninstall|adduser|enroll PROJECTNAME" echo "PROJECTNAME should be one of ccp|bbmri" } diff --git a/lib/install-bridgehead.sh b/lib/install-bridgehead.sh index 784020e..38c3874 100755 --- a/lib/install-bridgehead.sh +++ b/lib/install-bridgehead.sh @@ -30,13 +30,13 @@ EOF # TODO: Determine whether this should be located in setup-bridgehead (triggered through bridgehead install) or in update bridgehead (triggered every hour) if [ -z "$LDM_AUTH" ]; then - log "INFO" "Now generating basic auth for the local data management (see addUser in bridgehead for more information). " + log "INFO" "Now generating basic auth for the local data management (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 $PROJECT $generated_passwd "LDM_AUTH" $PROJECT fi 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). " + 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 fi