From 55fdeca0fcd557d3cf0890e0598cb3db2b6a7037 Mon Sep 17 00:00:00 2001 From: lablans Date: Tue, 7 Jan 2025 12:08:17 +0000 Subject: [PATCH] Actually use credential helper --- lib/update-bridgehead.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index 56afb17..c498f17 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -1,6 +1,8 @@ #!/bin/bash source lib/functions.sh +PROJECT="$1" + AUTO_HOUSEKEEPING=${AUTO_HOUSEKEEPING:-true} if [ "$AUTO_HOUSEKEEPING" == "true" ]; then @@ -19,7 +21,7 @@ fi hc_send log "Checking for bridgehead updates ..." -CONFFILE=/etc/bridgehead/$1.conf +CONFFILE=/etc/bridgehead/$PROJECT.conf if [ ! -e $CONFFILE ]; then fail_and_report 1 "Configuration file $CONFFILE not found." @@ -33,7 +35,7 @@ export SITE_ID checkOwner /srv/docker/bridgehead bridgehead || fail_and_report 1 "Update failed: Wrong permissions in /srv/docker/bridgehead" checkOwner /etc/bridgehead bridgehead || fail_and_report 1 "Update failed: Wrong permissions in /etc/bridgehead" -CREDHELPER="/srv/docker/bridgehead/lib/gitpassword.sh" +CREDHELPER="/srv/docker/bridgehead/bridgehead gitCredentials $PROJECT" CHANGES=""