summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-27 13:18:53 +0100
committerHarald Musum <musum@oath.com>2017-11-27 13:18:53 +0100
commit7dc90a4dc2865b22c1a62359bf0d86ecc2beb8e5 (patch)
treea1ff106997c361ceae105367aa0eebcf88937439
parent0b029516b14ccf7a8c15579117b78bdab8ba43a8 (diff)
Make sure file distributor is started when disable_filedistributor is unset
-rwxr-xr-xconfigserver/src/main/sh/start-filedistribution2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution
index a0cf1971215..1995e59de4e 100755
--- a/configserver/src/main/sh/start-filedistribution
+++ b/configserver/src/main/sh/start-filedistribution
@@ -63,7 +63,7 @@ ROOT=${VESPA_HOME%/}
VESPA_CONFIG_ID="dir:${ROOT}/conf/filedistributor"
export VESPA_CONFIG_ID
-if [ "$multitenant" = "true" -a "$disable_filedistributor" = "false" ]; then
+if [ "$multitenant" = "true" ] && [ "$disable_filedistributor" = "" ] || [ "$disable_filedistributor" = "false" ]; then
foo=`${ROOT}/libexec/vespa/vespa-config.pl -mkfiledistributorconfig`
PIDFILE_FILEDISTRIBUTOR=var/run/filedistributor.pid
LOGFILE="${ROOT}/logs/vespa/vespa.log"