diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index af4c67b..10ae89f 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -69,4 +69,4 @@ services: focus: environment: EXPORTER_URL: "http://exporter:8092" - AUTH_HEADER: "${EXPORTER_API_KEY}" + EXPORTER_API_KEY: "${EXPORTER_API_KEY}" diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index 44655b1..56afb17 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -58,7 +58,8 @@ for DIR in /etc/bridgehead $(pwd); do OUT=$(retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1) fi if [ $? -ne 0 ]; then - report_error log "Unable to update git $DIR: $OUT" + OUT_SAN=$(echo $OUT | sed -E 's|://[^:]+:[^@]+@|://credentials@|g') + report_error log "Unable to update git $DIR: $OUT_SAN" fi new_git_hash="$(git -C $DIR rev-parse --verify HEAD)"