aboutsummaryrefslogtreecommitdiffstats
path: root/zkfacade/src/main/sh/zkls
diff options
context:
space:
mode:
Diffstat (limited to 'zkfacade/src/main/sh/zkls')
-rwxr-xr-xzkfacade/src/main/sh/zkls7
1 files changed, 5 insertions, 2 deletions
diff --git a/zkfacade/src/main/sh/zkls b/zkfacade/src/main/sh/zkls
index a7c95eee224..c75f63efbde 100755
--- a/zkfacade/src/main/sh/zkls
+++ b/zkfacade/src/main/sh/zkls
@@ -56,9 +56,12 @@ findroot () {
findhost () {
if [ "${VESPA_HOSTNAME}" = "" ]; then
- VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1
+ VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
+ fi
+ validate="${VESPA_HOME}/bin/vespa-validate-hostname"
+ if [ -f "$validate" ]; then
+ "$validate" "${VESPA_HOSTNAME}" || exit 1
fi
- vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1
export VESPA_HOSTNAME
}