update bootstrap section of scripts

2 files changed, 21 insertions, 0 deletions

diff --git a/config/src/apps/vespa-activate-application/vespa-activate-application.sh b/config/src/apps/vespa-activate-application/vespa-activate-application.sh
index e94b5b5f11e..9eb95cc6290 100644
--- a/config/src/apps/vespa-activate-application/vespa-activate-application.sh
+++ b/config/src/apps/vespa-activate-application/vespa-activate-application.sh
@@ -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/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl
index 735a8054f52..d43016331f4 100755
--- a/config/src/apps/vespa-config/vespa-config.pl
+++ b/config/src/apps/vespa-config/vespa-config.pl
@@ -54,9 +54,21 @@ sub findhome {
     die "FATAL: Missing VESPA_HOME environment variable\n";
 }
 
+sub findhost {
+    $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'};
+    my $tmp = $ENV{'VESPA_HOSTNAME'};
+    if (!defined $tmp) {
+        $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n";
+    }
+    system("vespa-validate-hostname $tmp");
+    ( $? == 0 ) or die "Could not validate hostname\n";
+}
+
 BEGIN {
     my $tmp = findhome();
     $ENV{'VESPA_HOME'} = $tmp;
+    $tmp = findhost();
+    $ENV{'VESPA_HOSTNAME'} = $tmp;
 }
 my $VESPA_HOME = $ENV{'VESPA_HOME'};