summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-02-08 14:53:26 +0100
committerHarald Musum <musum@oath.com>2018-02-08 14:53:26 +0100
commit85fe747dae566daad8d17bdbf508b96ef18e0b64 (patch)
tree29cddecb984f9d975b25e0f2f7a80b5679b73a1f /configserver
parent07a796e91d91f1c12c6d4a148ed7714da4ea2b63 (diff)
Remove unused start-filedistribution script
Diffstat (limited to 'configserver')
-rw-r--r--configserver/CMakeLists.txt1
-rwxr-xr-xconfigserver/src/main/sh/start-configserver1
-rwxr-xr-xconfigserver/src/main/sh/start-filedistribution80
3 files changed, 0 insertions, 82 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt
index bb76e2f1f75..4f42ac6bcd3 100644
--- a/configserver/CMakeLists.txt
+++ b/configserver/CMakeLists.txt
@@ -2,7 +2,6 @@
install_fat_java_artifact(configserver)
vespa_install_script(src/main/sh/vespa-configserver-remove-state bin)
-vespa_install_script(src/main/sh/start-filedistribution libexec/vespa)
vespa_install_script(src/main/sh/ping-configserver libexec/vespa)
vespa_install_script(src/main/sh/start-configserver libexec/vespa)
vespa_install_script(src/main/sh/start-logd libexec/vespa)
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 996a1eb0b9d..d3c6a17b207 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -107,7 +107,6 @@ export LD_LIBRARY_PATH=${VESPA_HOME}/lib64
#Does not need fast allocation
export MALLOC_ARENA_MAX=1
-vespa-run-as-vespa-user ${VESPA_HOME}/libexec/vespa/start-filedistribution
vespa-run-as-vespa-user ${VESPA_HOME}/libexec/vespa/start-logd
# stuff for the configserver process:
diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution
deleted file mode 100755
index 1995e59de4e..00000000000
--- a/configserver/src/main/sh/start-filedistribution
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-# BEGIN environment bootstrap section
-# Do not edit between here and END as this section should stay identical in all scripts
-
-findpath () {
- myname=${0}
- mypath=${myname%/*}
- myname=${myname##*/}
- if [ "$mypath" ] && [ -d "$mypath" ]; then
- return
- fi
- mypath=$(pwd)
- if [ -f "${mypath}/${myname}" ]; then
- return
- fi
- echo "FATAL: Could not figure out the path where $myname lives from $0"
- exit 1
-}
-
-COMMON_ENV=libexec/vespa/common-env.sh
-
-source_common_env () {
- if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then
- export VESPA_HOME
- common_env=$VESPA_HOME/$COMMON_ENV
- if [ -f "$common_env" ]; then
- . $common_env
- return
- fi
- fi
- return 1
-}
-
-findroot () {
- source_common_env && return
- if [ "$VESPA_HOME" ]; then
- echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'"
- exit 1
- fi
- if [ "$ROOT" ] && [ -d "$ROOT" ]; then
- VESPA_HOME="$ROOT"
- source_common_env && return
- fi
- findpath
- while [ "$mypath" ]; do
- VESPA_HOME=${mypath}
- source_common_env && return
- mypath=${mypath%/*}
- done
- echo "FATAL: missing VESPA_HOME environment variable"
- echo "Could not locate $COMMON_ENV anywhere"
- exit 1
-}
-
-findroot
-
-# END environment bootstrap section
-
-ROOT=${VESPA_HOME%/}
-
-VESPA_CONFIG_ID="dir:${ROOT}/conf/filedistributor"
-export VESPA_CONFIG_ID
-
-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"
- VESPA_LOG_TARGET="file:${LOGFILE}"
- VESPA_LOG_CONTROL_DIR="${ROOT}/var/db/vespa/logcontrol"
- VESPA_LOG_CONTROL_FILE="${ROOT}/var/db/vespa/logcontrol/filedistributor.logcontrol"
- VESPA_SERVICE_NAME=filedistributor
- export VESPA_SERVICE_NAME
- export VESPA_LOG_TARGET
- export VESPA_LOG_CONTROL_DIR
- export VESPA_LOG_CONTROL_FILE
- cd ${ROOT}
- vespa-runserver -r 30 -s filedistributor -p $PIDFILE_FILEDISTRIBUTOR -- ${ROOT}/sbin/vespa-filedistributor --configid $VESPA_CONFIG_ID
-fi