aboutsummaryrefslogtreecommitdiffstats
path: root/application-preprocessor
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2018-05-16 06:49:56 +0000
committerArne Juul <arnej@yahoo-inc.com>2018-05-16 07:32:17 +0000
commita51021d1a2e737deefde42777e58d8e364af91ad (patch)
tree51a80363a1a19af91758c4322340ad5ea3ca4786 /application-preprocessor
parent8cabaa3da3bdf7a1de5cbf320772edd676763b26 (diff)
update bootstrap
Diffstat (limited to 'application-preprocessor')
-rw-r--r--application-preprocessor/src/main/sh/vespa-preprocess-application7
1 files changed, 5 insertions, 2 deletions
diff --git a/application-preprocessor/src/main/sh/vespa-preprocess-application b/application-preprocessor/src/main/sh/vespa-preprocess-application
index 0912f3720f4..40742461d81 100644
--- a/application-preprocessor/src/main/sh/vespa-preprocess-application
+++ b/application-preprocessor/src/main/sh/vespa-preprocess-application
@@ -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
}