diff options
| -rwxr-xr-x | config-model/src/main/perl/deploy | 2 | ||||
| -rwxr-xr-x | config-proxy/src/main/sh/config-ctl | 5 | ||||
| -rwxr-xr-x | vespabase/src/common-env.sh | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/config-model/src/main/perl/deploy b/config-model/src/main/perl/deploy index 31dda77b99e..47fb64106e0 100755 --- a/config-model/src/main/perl/deploy +++ b/config-model/src/main/perl/deploy @@ -303,7 +303,7 @@ sub fetch_directory { sub get_configsource_url { my ($command) = @_; - my @configsources = split(' ', `$VESPA_HOME/libexec/vespa/vespa-config.pl -confighttpsources`); + my @configsources = split(' ', `$VESPA_HOME/bin/vespa-print-default configservers_http`); my $configsource_url = shift(@configsources); if (!$configsource_url) { die "Could not get url to config server, make sure that VESPA_HOME and services.addr_configserver is set\n"; diff --git a/config-proxy/src/main/sh/config-ctl b/config-proxy/src/main/sh/config-ctl index 36155560d8d..3264a18ddec 100755 --- a/config-proxy/src/main/sh/config-ctl +++ b/config-proxy/src/main/sh/config-ctl @@ -64,9 +64,6 @@ ROOT=$VESPA_HOME export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } -# get common PATH: -. $ROOT/libexec/vespa/common-env.sh - P_SENTINEL=var/run/sentinel.pid P_CONFIG_PROXY=var/run/configproxy.pid @@ -105,7 +102,7 @@ export LD_LIBRARY_PATH="$VESPA_HOME/lib64" case $1 in start) - configsources=`libexec/vespa/vespa-config.pl -configsources` + configsources=`bin/vespa-print-default configservers_rpc` userargs=$vespa_base__jvmargs_configproxy if [ "$userargs" == "" ]; then userargs=$services__jvmargs_configproxy diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index e2e20b9bd8f..4c26e0e9396 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -221,7 +221,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" |