diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2018-05-14 13:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 13:28:25 +0200 |
| commit | 27ee37a86f0a22e6142fab65a8bfd316c7c3e36e (patch) | |
| tree | 6282d8877ceaa2dc000490b0775ea59953d3b152 /configserver | |
| parent | 3ff927eebb513b55311c7f758f6d8b45e01afa69 (diff) | |
| parent | 4d8fd8bb46d9656c6e61fd19c7a021e7a1b9d683 (diff) | |
Merge pull request #5857 from vespa-engine/arnej/use-hostname-utils
Arnej/use hostname utils
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 9 | ||||
| -rw-r--r-- | configserver/src/main/sh/start-logd | 9 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 9 | ||||
| -rwxr-xr-x | configserver/src/main/sh/vespa-configserver-remove-state | 9 |
4 files changed, 36 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index f4b59e2b49d..8c0ea810a9a 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -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/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 848d8dee6aa..ce0b60a8d8d 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -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/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 15ac6023a91..957fdb249c3 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -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/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index c781fcb0c0d..e3d348ecefa 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -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 |