diff options
Diffstat (limited to 'vespabase/src')
| -rwxr-xr-x | vespabase/src/common-env.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index b69dde089d4..a2c55439a3f 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -75,8 +75,6 @@ get_var() { } populate_environment () { - export VESPA_WEB_SERVICE_PORT=4080 - # these are the variables we want while running vespa: # VESPA_HOME - where is Vespa installed # VESPA_CONFIGSERVERS - the host (or list of host) where a configserver runs @@ -87,6 +85,7 @@ populate_environment () { # VESPA_CONFIGSERVER_RPC_PORT - the RPC port for configservers # VESPA_CONFIGSERVER_HTTP_PORT - the webservice (REST api) port for configservers # VESPA_CONFIG_PROTOCOL_VERSION - the RPC protocol version to use + # VESPA_WEB_SERVICE_PORT - where the main REST apis will normally run # debugging # VESPA_VALGRIND_OPT - for memory leak tracking, the options to use for valgrind @@ -221,7 +220,7 @@ no_transparent_hugepages () { } use_configserver_if_needed () { - nvcs=$(perl $VESPA_HOME/libexec/vespa/vespa-config.pl -allconfigsources) + nvcs=$($VESPA_HOME/bin/vespa-print-default configsources) x="$VESPA_CONFIG_SOURCES" if [ "$x" ]; then export VESPA_CONFIG_SOURCES="$x,$nvcs" |