diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-06-03 19:51:51 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-06-03 19:51:51 +0200 |
| commit | 4e52fd65b92542c21d904704b3af7d3c41f4fe16 (patch) | |
| tree | 9a0646030389d4678c9bef95d6c42f272e22435b /security-tools | |
| parent | 26ef5973ad94ca94a7b8d3dde5f89c3f46ab6b6b (diff) | |
Use https when VESPA_TLS_ENABLED is set
Diffstat (limited to 'security-tools')
| -rwxr-xr-x | security-tools/src/main/sh/vespa-curl-wrapper | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper index fb2142b5a1b..7c2f31d7719 100755 --- a/security-tools/src/main/sh/vespa-curl-wrapper +++ b/security-tools/src/main/sh/vespa-curl-wrapper @@ -11,6 +11,13 @@ set -e CURL_PARAMETERS=$1 CONFIGSERVER_URI_WITHOUT_SCHEME=$2 +if [ -n "${VESPA_TLS_ENABLED}" ] +then + CONFIGSERVER_URI="https://${CONFIGSERVER_URI_WITHOUT_SCHEME}" +else + CONFIGSERVER_URI="http://${CONFIGSERVER_URI_WITHOUT_SCHEME}" +fi + if [ -n "${VESPA_TLS_CA_CERT}" ] then CURL_PARAMETERS="--cacert \"${VESPA_TLS_CA_CERT}\" ${CURL_PARAMETERS}" @@ -19,9 +26,6 @@ fi if [[ -n "${VESPA_TLS_CERT}" && -n "${VESPA_TLS_PRIVATE_KEY}" ]] then CURL_PARAMETERS="--cert \"${VESPA_TLS_CERT}\" --key \"${VESPA_TLS_PRIVATE_KEY}\" ${CURL_PARAMETERS}" - CONFIGSERVER_URI="https://${CONFIGSERVER_URI_WITHOUT_SCHEME}" -else - CONFIGSERVER_URI="http://${CONFIGSERVER_URI_WITHOUT_SCHEME}" fi curl ${CURL_PARAMETERS} "${CONFIGSERVER_URI}" |