aboutsummaryrefslogtreecommitdiffstats
path: root/vespabase/src/vespa-start-configserver.sh
diff options
context:
space:
mode:
Diffstat (limited to 'vespabase/src/vespa-start-configserver.sh')
-rwxr-xr-xvespabase/src/vespa-start-configserver.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh
index 7d717c4b1dc..3a7416c5162 100755
--- a/vespabase/src/vespa-start-configserver.sh
+++ b/vespabase/src/vespa-start-configserver.sh
@@ -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
}