From aa330c7b0c1f5e8ea7b2976a4ac57b60fb125f14 Mon Sep 17 00:00:00 2001 From: janskiba Date: Wed, 7 Aug 2024 08:08:05 +0000 Subject: [PATCH] test --- lib/functions.sh | 3 ++- lib/prerequisites.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/functions.sh b/lib/functions.sh index dc5ec25..6ed1f45 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -32,6 +32,7 @@ setupProxy() { fi fi + echo "$HTTPS_PROXY_FULL_URL" log INFO "Configuring proxy servers: $http http proxy (we're not supporting unencrypted comms), $https https proxy" export HTTPS_PROXY_HOST HTTPS_PROXY_PORT HTTPS_PROXY_FULL_URL } @@ -308,7 +309,7 @@ function sync_secrets() { -v /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro \ -e TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs \ -e NO_PROXY=localhost,127.0.0.1 \ - -e ALL_PROXY=$HTTPS_PROXY_FULL_URL \ + -e ALL_PROXY=$HTTPS_PROXY_URL \ -e PROXY_ID=$PROXY_ID \ -e BROKER_URL=$BROKER_URL \ -e OIDC_PROVIDER=secret-sync-central.oidc-client-enrollment.$BROKER_ID \ diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 235826a..caece60 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -69,7 +69,7 @@ source ${PROJECT}/vars if [ "${PROJECT}" != "minimal" ]; then set +e - SERVERTIME="$(https_proxy=$HTTPS_PROXY_FULL_URL curl -m 5 -s -I $BROKER_URL_FOR_PREREQ 2>&1 | grep -i -e '^Date: ' | sed -e 's/^Date: //i')" + SERVERTIME="$(curl -m 5 -s -I $BROKER_URL_FOR_PREREQ 2>&1 | grep -i -e '^Date: ' | sed -e 's/^Date: //i')" RET=$? set -e if [ $RET -ne 0 ]; then