diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-05-09 14:00:59 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-05-14 10:08:15 +0000 |
| commit | cc5f5b2b41db293a9ce7ef554adde9e776fd1ad2 (patch) | |
| tree | 4afd49f607f3b11f077aa61a8187585dcfa98dbe /config-proxy | |
| parent | 5224e612edc9f5af2f93051a41000a36ca6c5c93 (diff) | |
update bootstrap section of scripts
Diffstat (limited to 'config-proxy')
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 9 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/vespa-config-loadtester.sh | 9 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/vespa-config-verification.sh | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index 407b3179a88..6c92bf3c3b2 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config-proxy/src/main/sh/vespa-config-loadtester.sh b/config-proxy/src/main/sh/vespa-config-loadtester.sh index fc0a33d8d49..5122d74f59c 100644 --- a/config-proxy/src/main/sh/vespa-config-loadtester.sh +++ b/config-proxy/src/main/sh/vespa-config-loadtester.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config-proxy/src/main/sh/vespa-config-verification.sh b/config-proxy/src/main/sh/vespa-config-verification.sh index 52174495ee3..584129f686d 100644 --- a/config-proxy/src/main/sh/vespa-config-verification.sh +++ b/config-proxy/src/main/sh/vespa-config-verification.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section |