From 12147c678d10cef58fe61637e8f097add608d3d9 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 19 Apr 2023 12:23:09 +0200 Subject: GC undocumented env var that has been replaced by VESPA_CONFIGSERVER_MULTITENANT a long time ago --- configserver/src/main/sh/start-logd | 2 +- configserver/src/main/sh/stop-configserver | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configserver/src/main/sh') diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 30aa357de12..3339338cb15 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -79,7 +79,7 @@ export ROOT export VESPA_CONFIG_ID="file:${VESPA_HOME}/conf/logd/logd.cfg" -if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then +if [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then PIDFILE_LOGD=var/run/logd.pid VESPA_SERVICE_NAME=logd export VESPA_SERVICE_NAME diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 2ee6ac4fccf..00e3e009e1a 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -89,7 +89,7 @@ PIDFILE_LOGD=var/run/logd.pid VESPA_LOG_TARGET="file:${VESPA_HOME}/logs/vespa/vespa.log" export VESPA_LOG_TARGET -if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then +if [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then vespa-run-as-vespa-user vespa-runserver -s logd -p $PIDFILE_LOGD -S fi -- cgit v1.2.3