summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-11-16 13:48:23 +0100
committerGitHub <noreply@github.com>2022-11-16 13:48:23 +0100
commita91a411a0893853fd6f62dfeb9f31ec14c896604 (patch)
tree4fc6ea4e8c5c3b91c53ac695ccb604cb08e6b0c7
parentb393c0c7cc3d3bda40d7694baee5580950f97004 (diff)
parent5f8e4e0d13fb0b3ec4ee9f4e0de80258bce124dd (diff)
Merge pull request #24887 from vespa-engine/revert-24874-arnej/use-new-configserver-startup
Revert "switch configserver startup script"
-rw-r--r--client/CMakeLists.txt1
-rw-r--r--vespabase/CMakeLists.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8cd921e0d0c..2507215e70d 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -19,7 +19,6 @@ install_symlink(libexec/vespa/script-utils bin/vespa-security-env)
install_symlink(libexec/vespa/script-utils bin/vespa-get-cluster-state)
install_symlink(libexec/vespa/script-utils bin/vespa-get-node-state)
install_symlink(libexec/vespa/script-utils bin/vespa-set-node-state)
-install_symlink(libexec/vespa/script-utils bin/vespa-start-configserver)
install_symlink(libexec/vespa/script-utils bin/vespa-get-config)
install_symlink(libexec/vespa/script-utils bin/vespa-verify-ranksetup)
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index e8b1e583f85..e72f02d5eeb 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -6,6 +6,7 @@ vespa_install_script(src/rhel-prestart.sh vespa-prestart.sh bin)
vespa_install_script(src/common-env.sh common-env.sh libexec/vespa)
vespa_install_script(src/start-vespa-base.sh start-vespa-base.sh libexec/vespa)
vespa_install_script(src/stop-vespa-base.sh stop-vespa-base.sh libexec/vespa)
+vespa_install_script(src/vespa-start-configserver.sh vespa-start-configserver bin)
vespa_install_script(src/vespa-start-services.sh vespa-start-services bin)
vespa_install_script(src/vespa-stop-configserver.sh vespa-stop-configserver bin)
vespa_install_script(src/vespa-stop-services.sh vespa-stop-services bin)