diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-05-16 06:49:56 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-05-16 07:32:17 +0000 |
commit | a51021d1a2e737deefde42777e58d8e364af91ad (patch) | |
tree | 51a80363a1a19af91758c4322340ad5ea3ca4786 /vespabase | |
parent | 8cabaa3da3bdf7a1de5cbf320772edd676763b26 (diff) |
update bootstrap
Diffstat (limited to 'vespabase')
-rwxr-xr-x | vespabase/src/rhel-prestart.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/start-cbinaries.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/start-tool.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/start-vespa-base.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/stop-vespa-base.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/vespa-start-configserver.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/vespa-start-services.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/vespa-stop-configserver.sh | 7 | ||||
-rwxr-xr-x | vespabase/src/vespa-stop-services.sh | 7 |
9 files changed, 45 insertions, 18 deletions
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 4763494669c..8061c497454 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.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 } diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh index 08197304378..f81c2d9ada3 100755 --- a/vespabase/src/start-cbinaries.sh +++ b/vespabase/src/start-cbinaries.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 } diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh index 7c7b26db768..f3100739cde 100755 --- a/vespabase/src/start-tool.sh +++ b/vespabase/src/start-tool.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 } diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh index 48518291c83..a346854134d 100755 --- a/vespabase/src/start-vespa-base.sh +++ b/vespabase/src/start-vespa-base.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 } diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh index e25c251dd75..4e14b51c869 100755 --- a/vespabase/src/stop-vespa-base.sh +++ b/vespabase/src/stop-vespa-base.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 } 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 } diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh index 90a9667e402..ef8a6b55f05 100755 --- a/vespabase/src/vespa-start-services.sh +++ b/vespabase/src/vespa-start-services.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 } diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh index 88eefd38f3b..a0c3ca7169b 100755 --- a/vespabase/src/vespa-stop-configserver.sh +++ b/vespabase/src/vespa-stop-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 } diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh index 2ca245b2c93..0f1fcd30abe 100755 --- a/vespabase/src/vespa-stop-services.sh +++ b/vespabase/src/vespa-stop-services.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 } |