diff options
Diffstat (limited to 'config-proxy/src/main/sh/vespa-config-ctl.sh')
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index d6d0075b555..e02073787db 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -72,21 +72,22 @@ findhost () { findroot findhost -# END environment bootstrap section - ROOT=${VESPA_HOME%/} export ROOT -cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } + +# END environment bootstrap section + +cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } P_SENTINEL=var/run/sentinel.pid P_CONFIG_PROXY=var/run/configproxy.pid export P_SENTINEL P_CONFIG_PROXY -LOGDIR="$ROOT/logs/vespa" +LOGDIR="${VESPA_HOME}/logs/vespa" LOGFILE="$LOGDIR/vespa.log" VESPA_LOG_TARGET="file:$LOGFILE" -VESPA_LOG_CONTROL_DIR="$ROOT/var/db/vespa/logcontrol" +VESPA_LOG_CONTROL_DIR="${VESPA_HOME}/var/db/vespa/logcontrol" cp="libexec/vespa/patches/configproxy:lib/jars/config-proxy-jar-with-dependencies.jar" VESPA_LOG_LEVEL="all -debug -spam" @@ -101,7 +102,7 @@ hname=$(vespa-print-default hostname) CONFIG_ID="hosts/$hname" export CONFIG_ID export MALLOC_ARENA_MAX=1 #Does not need fast allocation -export LD_LIBRARY_PATH="$VESPA_HOME/lib64" +export LD_LIBRARY_PATH="${VESPA_HOME}/lib64" case $1 in |